762038 - get rid HyperTextAccessible CID

Status: RESOLVED FIXED

(Core :: Disability Access APIs, defect)

Description

[alexander :surkov (:asurkov)]

All instances like
nsRefPtr<HyperTextAccessible> text(do_QueryObject(obj));
replace on
nsRefPtr<Accessible> acc(do_QueryObject(obj));
HyperTextAccessible* text = acc->AsHyperText();

remove NS_HYPERTEXTACCESSIBLE_IMPL_CID and fix HyperTextAccessible::QueryInterface

Comment 1

[Andrew Quartey [:drexler]]

Attachment: patch

Locally tested and sent to try: https://tbpl.mozilla.org/?tree=Try&rev=1c1fbb2ad915

Comment 2

[alexander :surkov (:asurkov)]

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

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

looks ok

::: accessible/src/base/nsAccessiblePivot.cpp
@@ +154,5 @@
>    NS_ENSURE_TRUE(aStartOffset <= aEndOffset &&
>                   (aStartOffset >= 0 || (aStartOffset != -1 && aEndOffset != -1)),
>                   NS_ERROR_INVALID_ARG);
> +  
> +  nsRefPtr<Accessible> acc(do_QueryObject(aTextAccessible));

technically it may be null so add a check please, if null return invalid arg

@@ +170,5 @@
>    mStartOffset = aStartOffset;
>    mEndOffset = aEndOffset;
>  
>    nsRefPtr<Accessible> oldPosition = mPosition.forget();
> +  mPosition = do_QueryObject(newPosition);

mPosition = newPosition should be enough

Comment 3

[Trevor Saunders (:tbsaunde)]

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

>-
>-  nsRefPtr<HyperTextAccessible> newPosition = do_QueryObject(aTextAccessible);
>+  

you introduce trailing whitespace here too.

Comment 4

[Andrew Quartey [:drexler]]

Attachment: updated_patch

fixed the nits and the Mac OS QI call failure for a HyperTextAccessible initialization i talked about in IRC. File in question is mozTextAccessible.mm

Comment 5

[Trevor Saunders (:tbsaunde)]

Comment on attachment 634302 [details] [diff] [review]
updated_patch

>+  nsRefPtr<Accessible> acc(do_QueryObject(aTextAccessible));
>+  if (!acc)
>+    return NS_ERROR_INVALID_ARG;
>+  HyperTextAccessible* newPosition = acc->AsHyperText();

nit, blank line after return

>   if ((self = [super initWithAccessible:accessible])) {
>-    CallQueryInterface(accessible, &mGeckoTextAccessible);
>+    mGeckoTextAccessible = accessible->AsHyperText();

so, this code is crazy, but I hope there is now an unmatched Release() somewhere.  The easiest fix is probably to just NS_IF_ADDREF() on mGeckoTextAccessible, but that's really broken and would add to the pile ofthings that need to be fixed here.  I suspect the correct fix is to change NS_IF_RELEASE() in expire() in this file to mGeckoTextAccessible = nsnull, but I'm not sure that's correct though it seems more sane than what we have now, and is atleast a step in the right direction.

Comment 6

[Andrew Quartey [:drexler]]

Attachment: patch_for_checkin

(In reply to Trevor Saunders (:tbsaunde) from comment #5)
 
Fixed nits and set mGeckoTextAccessible = nsnull in expire().

Comment 7

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/b17e673803b4

Comment 8

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/b17e673803b4