767264 - remove uses of do_QueryObject() in CAccessibleHyperlink

Status: RESOLVED FIXED

Description

[Trevor Saunders (:tbsaunde)]

same as bugs 762394 accept you sttic cast to AccessibleWrap*

Comment 1

[Mark Capella [:capella]]

Created attachment 635671 [details] [diff] [review]
Patch (v1)

First / quick try at this ....

Comment 2

[Mark Capella [:capella]]

Created attachment 635706 [details] [diff] [review]
Patch (v2)

Bah ... missed several nits...

Comment 3

[Trevor Saunders (:tbsaunde)]

Comment on attachment 635706 [details] [diff] [review]
Patch (v2)

/src/msaa/ia2AccessibleHyperlink.cpp
>rename from accessible/src/msaa/CAccessibleHyperlink.cpp
>rename to accessible/src/msaa/ia2AccessibleHyperlink.cpp
>--- a/accessible/src/msaa/CAccessibleHyperlink.cpp
>+++ b/accessible/src/msaa/ia2AccessibleHyperlink.cpp
>@@ -1,53 +1,53 @@
> /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
> /* vim:expandtab:shiftwidth=2:tabstop=2:
>  */
> /* This Source Code Form is subject to the terms of the Mozilla Public
>  * License, v. 2.0. If a copy of the MPL was not distributed with this
>  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
> 
>-#include "CAccessibleHyperlink.h"
>+#include "ia2AccessibleHyperlink.h"
> 
> #include "Accessible2.h"
> #include "AccessibleHyperlink.h"
> #include "AccessibleHyperlink_i.c"
> 
> #include "AccessibleWrap.h"
> #include "nsIWinAccessNode.h"

is that actually used?

>-CAccessibleHyperlink::QueryInterface(REFIID iid, void** ppv)
>+ia2AccessibleHyperlink::QueryInterface(REFIID iid, void** ppv)
> {
>   *ppv = NULL;
> 
>   if (IID_IAccessibleHyperlink == iid) {
>-    nsRefPtr<Accessible> thisObj = do_QueryObject(this);
>+    Accessible* thisObj = static_cast<AccessibleWrap*>(this);
>     if (!thisObj->IsLink())
>       return E_NOINTERFACE;

it seems you don't need the local variable.

>-CAccessibleHyperlink::get_anchor(long aIndex, VARIANT *aAnchor)
>+ia2AccessibleHyperlink::get_anchor(long aIndex, VARIANT* aAnchor)

type* name


I'm pretty sure this is fine, but it would be nice if David could tkae a glance and make sure I'm not missing something.

Comment 4

[Mark Capella [:capella]]

Created attachment 636020 [details] [diff] [review]
Patch (v3)

Nits addressed, and asking David to look this over as well ...

Comment 5

[David Bolter [:davidb]]

Comment on attachment 636020 [details] [diff] [review]
Patch (v3)

Review of attachment 636020 [details] [diff] [review]:
-----------------------------------------------------------------

looks fine - thanks. r=me

Comment 6

[Mark Capella [:capella]]

Push to TRY:
https://tbpl.mozilla.org/?tree=Try&rev=15c5068f7831

Comment 7

[Mark Capella [:capella]]

On to inbound:
https://tbpl.mozilla.org/?tree=Mozilla-Inbound&rev=49819cb04654

Comment 8

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/49819cb04654