Chromium Code Reviews| Index: third_party/WebKit/Source/devtools/front_end/accessibility/AccessibilitySidebarView.js |
| diff --git a/third_party/WebKit/Source/devtools/front_end/accessibility/AccessibilitySidebarView.js b/third_party/WebKit/Source/devtools/front_end/accessibility/AccessibilitySidebarView.js |
| index b76be955dc1b53fb3aca91cd253141c108366648..ae9b19b94851a53e0e40bc2d5f2e34bc2291684c 100644 |
| --- a/third_party/WebKit/Source/devtools/front_end/accessibility/AccessibilitySidebarView.js |
| +++ b/third_party/WebKit/Source/devtools/front_end/accessibility/AccessibilitySidebarView.js |
| @@ -29,22 +29,23 @@ WebInspector.AccessibilitySidebarView = class extends WebInspector.ThrottledWidg |
| } |
| /** |
| - * @param {?Array<!WebInspector.AccessibilityNode>} nodes |
| + * @param {?WebInspector.AccessibilityNode} axNode |
| */ |
| - accessibilityNodeCallback(nodes) { |
| - if (!nodes) |
| + accessibilityNodeCallback(axNode) { |
| + if (!axNode) |
| return; |
| - var currentAXNode = nodes[0]; |
| - if (currentAXNode.ignored) |
| + this._axNode = axNode; |
| + |
| + if (axNode.ignored()) |
| this._sidebarPaneStack.removeView(this._ariaSubPane); |
| else |
| this._sidebarPaneStack.showView(this._ariaSubPane, this._axNodeSubPane); |
| if (this._axNodeSubPane) |
| - this._axNodeSubPane.setAXNode(currentAXNode); |
| + this._axNodeSubPane.setAXNode(axNode); |
| if (this._treeSubPane) |
| - this._treeSubPane.setAXNodeAndAncestors(nodes); |
| + this._treeSubPane.setAXNode(axNode); |
| } |
| /** |
| @@ -57,9 +58,15 @@ WebInspector.AccessibilitySidebarView = class extends WebInspector.ThrottledWidg |
| this._treeSubPane.setNode(node); |
| this._axNodeSubPane.setNode(node); |
| this._ariaSubPane.setNode(node); |
| - return WebInspector.AccessibilityModel.fromTarget(node.target()).getAXNodeChain(node).then((nodes) => { |
| - this.accessibilityNodeCallback(nodes); |
| - }); |
| + if (!node) |
| + return Promise.resolve(); |
| + var accessibilityModel = WebInspector.AccessibilityModel.fromTarget(node.target()); |
| + return accessibilityModel.setDOMNode(node) |
|
dgozman
2016/11/03 22:07:29
Instead of this, I propose to:
- call accessibilit
aboxhall
2016/11/04 22:31:17
Done, I think. Was this what you had in mind?
|
| + .then(accessibilityModel.resolveAllDOMNodes.bind(accessibilityModel)) |
| + .then(accessibilityModel.getInspectedAXNode.bind(accessibilityModel)) |
| + .then((axNode) => { |
| + this.accessibilityNodeCallback(axNode); |
| + }); |
| } |
| /** |