Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 /** | 4 /** |
| 5 * @unrestricted | 5 * @unrestricted |
| 6 */ | 6 */ |
| 7 Accessibility.AXTreePane = class extends Accessibility.AccessibilitySubPane { | 7 Accessibility.AXTreePane = class extends Accessibility.AccessibilitySubPane { |
| 8 constructor() { | 8 /** |
| 9 * @param {!Accessibility.AccessibilitySidebarView} axSidebarView | |
| 10 */ | |
| 11 constructor(axSidebarView) { | |
| 9 super(Common.UIString('Accessibility Tree')); | 12 super(Common.UIString('Accessibility Tree')); |
| 10 | 13 |
| 14 this._axSidebarView = axSidebarView; | |
| 11 this._treeOutline = this.createTreeOutline(); | 15 this._treeOutline = this.createTreeOutline(); |
| 12 | 16 |
| 13 this.element.classList.add('accessibility-computed'); | 17 this.element.classList.add('accessibility-computed'); |
| 14 | 18 |
| 15 this._expandedNodes = new Set(); | 19 this._expandedNodes = new Set(); |
| 16 } | 20 } |
| 17 | 21 |
| 18 /** | 22 /** |
| 19 * @param {?Accessibility.AccessibilityNode} axNode | 23 * @param {?Accessibility.AccessibilityNode} axNode |
| 20 * @override | 24 * @override |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 70 } | 74 } |
| 71 | 75 |
| 72 inspectedNodeTreeElement.selectable = true; | 76 inspectedNodeTreeElement.selectable = true; |
| 73 inspectedNodeTreeElement.select(!this._selectedByUser /* omitFocus */, false ); | 77 inspectedNodeTreeElement.select(!this._selectedByUser /* omitFocus */, false ); |
| 74 if (this.isExpanded(axNode.backendDOMNodeId())) | 78 if (this.isExpanded(axNode.backendDOMNodeId())) |
| 75 inspectedNodeTreeElement.expand(); | 79 inspectedNodeTreeElement.expand(); |
| 76 this.clearSelectedByUser(); | 80 this.clearSelectedByUser(); |
| 77 } | 81 } |
| 78 | 82 |
| 79 /** | 83 /** |
| 84 * @param {!Accessibility.AccessibilityNode} axNode | |
| 85 */ | |
| 86 setSelectedNode(axNode) { | |
| 87 if (axNode.parentNode()) { | |
| 88 Common.Revealer.reveal(axNode.deferredDOMNode()); | |
| 89 } else { | |
| 90 // Only set the node for the accessibility panel, not the Elements tree. | |
| 91 var axSidebarView = this._axSidebarView; | |
| 92 function nodeResolved(node) { | |
|
dgozman
2017/01/04 00:11:05
Can use arrow function instead.
aboxhall
2017/01/04 01:06:10
Done.
| |
| 93 axSidebarView.setNode(node); | |
| 94 } | |
| 95 axNode.deferredDOMNode().resolve(nodeResolved); | |
| 96 } | |
| 97 } | |
| 98 | |
| 99 /** | |
| 80 * @param {boolean} selectedByUser | 100 * @param {boolean} selectedByUser |
| 81 */ | 101 */ |
| 82 setSelectedByUser(selectedByUser) { | 102 setSelectedByUser(selectedByUser) { |
| 83 this._selectedByUser = true; | 103 this._selectedByUser = true; |
| 84 } | 104 } |
| 85 | 105 |
| 86 clearSelectedByUser() { | 106 clearSelectedByUser() { |
| 87 delete this._selectedByUser; | 107 delete this._selectedByUser; |
| 88 } | 108 } |
| 89 | 109 |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 130 | 150 |
| 131 this.element = UI.Icon.create('smallicon-arrow-in-circle', 'inspect-dom-node '); | 151 this.element = UI.Icon.create('smallicon-arrow-in-circle', 'inspect-dom-node '); |
| 132 this.element.addEventListener('mousedown', this._handleMouseDown.bind(this)) ; | 152 this.element.addEventListener('mousedown', this._handleMouseDown.bind(this)) ; |
| 133 } | 153 } |
| 134 | 154 |
| 135 /** | 155 /** |
| 136 * @param {!Event} event | 156 * @param {!Event} event |
| 137 */ | 157 */ |
| 138 _handleMouseDown(event) { | 158 _handleMouseDown(event) { |
| 139 this._treePane.setSelectedByUser(true); | 159 this._treePane.setSelectedByUser(true); |
| 140 Common.Revealer.reveal(this._axNode.deferredDOMNode()); | 160 this._treePane.setSelectedNode(this._axNode); |
|
dgozman
2017/01/04 00:11:05
Does it make sense to merge setSelectedByUser and
aboxhall
2017/01/04 01:06:10
I wanted to leave them separate, since it's plausi
| |
| 141 } | 161 } |
| 142 }; | 162 }; |
| 143 | 163 |
| 144 /** | 164 /** |
| 145 * @unrestricted | 165 * @unrestricted |
| 146 */ | 166 */ |
| 147 Accessibility.AXNodeTreeElement = class extends UI.TreeElement { | 167 Accessibility.AXNodeTreeElement = class extends UI.TreeElement { |
| 148 /** | 168 /** |
| 149 * @param {!Accessibility.AccessibilityNode} axNode | 169 * @param {!Accessibility.AccessibilityNode} axNode |
| 150 * @param {!Accessibility.AXTreePane} treePane | 170 * @param {!Accessibility.AXTreePane} treePane |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 198 * @param {!Event} event | 218 * @param {!Event} event |
| 199 * @return {boolean} | 219 * @return {boolean} |
| 200 */ | 220 */ |
| 201 ondblclick(event) { | 221 ondblclick(event) { |
| 202 this.inspectDOMNode(); | 222 this.inspectDOMNode(); |
| 203 return true; | 223 return true; |
| 204 } | 224 } |
| 205 | 225 |
| 206 inspectDOMNode() { | 226 inspectDOMNode() { |
| 207 this._treePane.setSelectedByUser(true); | 227 this._treePane.setSelectedByUser(true); |
| 208 Common.Revealer.reveal(this._axNode.deferredDOMNode()); | 228 this._treePane.setSelectedNode(this._axNode); |
| 209 } | 229 } |
| 210 | 230 |
| 211 /** | 231 /** |
| 212 * @override | 232 * @override |
| 213 */ | 233 */ |
| 214 onattach() { | 234 onattach() { |
| 215 this._update(); | 235 this._update(); |
| 216 } | 236 } |
| 217 | 237 |
| 218 _update() { | 238 _update() { |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 409 continue; | 429 continue; |
| 410 } | 430 } |
| 411 siblingTreeElement = new Accessibility.AXNodeTreeElement(sibling, this._tr eePane); | 431 siblingTreeElement = new Accessibility.AXNodeTreeElement(sibling, this._tr eePane); |
| 412 if (foundInspectedNode) | 432 if (foundInspectedNode) |
| 413 this.appendChild(siblingTreeElement); | 433 this.appendChild(siblingTreeElement); |
| 414 else | 434 else |
| 415 this.insertChild(siblingTreeElement, nextIndex++); | 435 this.insertChild(siblingTreeElement, nextIndex++); |
| 416 } | 436 } |
| 417 } | 437 } |
| 418 }; | 438 }; |
| OLD | NEW |