762394 - replace do_QueryObject() with static cast in CAccessibleText

Status: RESOLVED FIXED

(Core :: Disability Access APIs, defect)

Description

[Trevor Saunders (:tbsaunde)]

nsRefPtr<HypertextAccessible> foo = do_QueryObject(this); should become HypertextAccessible* foo = static_cast<HypertextAccessibleWrap*>(this);
also rename it to ia2Text

Comment 1

[Trevor Saunders (:tbsaunde)]

> also rename it to ia2Text

actually, ia2AccessibleText

Comment 2

[Andrew Quartey [:drexler]]

Attachment: patch

passed tests locally.

Comment 3

[Trevor Saunders (:tbsaunde)]

Comment on attachment 633202 [details] [diff] [review]
patch

> #include "HyperTextAccessible.h"
>+#include "HyperTextAccessibleWrap.h"

HypertextAccessibleWrap.h is enough

> {
> __try {
>-  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
>-  if (textAcc->IsDefunct())
>+  HyperTextAccessible* ia2AccessibleText = static_cast<HyperTextAccessibleWrap*>(this);

same as bug 762396 rename the class not variable names :)  Sorry I wasn't clearer.

otherwise this one seems fine too

Comment 4

[Andrew Quartey [:drexler]]

Attachment: patch

updated patch addressing comments.

Comment 5

[Trevor Saunders (:tbsaunde)]

Comment on attachment 633349 [details] [diff] [review]
patch

># HG changeset patch
># Parent e116a5da6cedfe7f980979005c5f4eaa4e0bfa4c
># User Andrew Quartey <[e-mail]>
>Bug 762394 - Replace do_QueryObject() with static_cast in CAccessibleText
>
>diff --git a/accessible/src/msaa/HyperTextAccessibleWrap.h b/accessible/src/msaa/HyperTextAccessibleWrap.h
>--- a/accessible/src/msaa/HyperTextAccessibleWrap.h
>+++ b/accessible/src/msaa/HyperTextAccessibleWrap.h
>@@ -4,17 +4,17 @@
> /* 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/. */
> 
> #ifndef mozilla_a11y_HyperTextAccessibleWrap_h__
> #define mozilla_a11y_HyperTextAccessibleWrap_h__
> 
> #include "HyperTextAccessible.h"
>-#include "CAccessibleText.h"
>+#include "ia2AccessibleText.h"
> #include "CAccessibleEditableText.h"
> #include "ia2AccessibleHyperText.h"

you should keep them in order, but actually I don't think you need to include it here at all.

> STDMETHODIMP
>-CAccessibleText::get_attributes(long aOffset, long *aStartOffset,
>+ia2AccessibleText::get_attributes(long aOffset, long *aStartOffset,
>                                 long *aEndOffset, BSTR *aTextAttributes)

nit, you break alignment here, and other methods with args on a second line.

> {

Comment 6

[Andrew Quartey [:drexler]]

Attachment: updated_patch

Updated patch addressing nits.

Comment 7

[Geoff Lankow (:darktrojan)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/400bc23212f7

Comment 8

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/400bc23212f7