725565 - update DOMi since nsIAccessNode interface was removed

Status: RESOLVED FIXED

(Other Applications :: DOM Inspector, defect)

Description

[alexander :surkov (:asurkov)]

nsIAccessNode was removed in bug 672507, DOMi should be updated

Comment 1

[alexander :surkov (:asurkov)]

Attachment: patch

Comment 2

[alexander :surkov (:asurkov)]

comment:
QI nsIAccessible interface, used for compatibility with Gecko versions prior
 * to Gecko13.

was updated to:

QI nsIAccessNode interface if any, used for compatibility with Gecko versions
 * prior to Gecko13.

Comment 3

[[e-mail]]

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

> const gAccInterfaces =
> [
>   Ci.nsIAccessible,
>   Ci.nsIAccessibleDocument,
>   Ci.nsIAccessibleEditableText,
>   Ci.nsIAccessibleHyperLink,
>   Ci.nsIAccessibleHyperText,
>   Ci.nsIAccessibleImage,
>   Ci.nsIAccessibleSelectable,
>   Ci.nsIAccessibleTable,
>   Ci.nsIAccessibleTableCell,
>   Ci.nsIAccessibleText,
>-  Ci.nsIAccessibleValue,
>-  Ci.nsIAccessNode,
>+  Ci.nsIAccessibleValue
> ];
In this case, I think it would look better if you pushed Ci.nsIAccessNode on to the end of the array if it exists (same for evalJSDialog.js).

>+  if ("nsIAccessNode" in Ci) {
>+    return XPCU.QI(aAccessible, Ci.nsIAccessNode);
>+  }
>+  return aAccessible;
Nit: use a ?: expression for these. r=me with that fixed.

>diff --git a/resources/content/viewers/accessibleProps/accessiblePropViewerMgr.js b/resources/content/viewers/accessibleProps/accessiblePropViewerMgr.js
...
>+  var accessNode = QIAccessNode(this.getAccessible(aRow));
...
>diff --git a/resources/content/viewers/accessibleProps/accessibleProps.js b/resources/content/viewers/accessibleProps/accessibleProps.js
>+function QIAccessNode(aAccessible)
This looks confusing, but I guess it's OK.

>-  var accessNode = this.mTargets.queryElementAt(aRow, nsIAccessNode);
Another possibility:
const nsIAccessNode = "nsIAccessNode" in Components.interfaces ?
    Components.interfaces.nsIAccessNode : nsIAccessible;
Or even:
const nsIAccessNode = Components.interfaces.nsIAccessNode || nsIAccessible;

Comment 4

[alexander :surkov (:asurkov)]

Attachment: patch2

Neil, please quick check if your comments were addressed

Comment 5

[[e-mail]]

Comment on attachment 596049 [details] [diff] [review]
patch2

>diff --git a/resources/content/viewers/accessibleRelations/accessibleRelations.js b/resources/content/viewers/accessibleRelations/accessibleRelations.js
...
>+function QIAccessNode(aAccessible)
Not used, because of the "new" nsIAccessNode const. (You might want to move the comment to the const though.)

>diff --git a/resources/content/viewers/accessibleTree/evalJSDialog.js b/resources/content/viewers/accessibleTree/evalJSDialog.js
...
>+function QIAccessNode(aAccessible)
Not used, because you push Ci.nsIAccessNode into gAccInterfaces.

r=me with those removed.

Comment 6

[alexander :surkov (:asurkov)]

landed with Neil's comments addressed http://hg.mozilla.org/dom-inspector/rev/0bc5a6d7a31a