Chromium Code Reviews| Index: third_party/WebKit/Source/modules/accessibility/InspectorAccessibilityAgent.h |
| diff --git a/third_party/WebKit/Source/modules/accessibility/InspectorAccessibilityAgent.h b/third_party/WebKit/Source/modules/accessibility/InspectorAccessibilityAgent.h |
| index b0eb77ce18e23eae8914db0c6aaf3e34fb0ae9cd..367632fe57dc27c69a62353475e374a96cd46996 100644 |
| --- a/third_party/WebKit/Source/modules/accessibility/InspectorAccessibilityAgent.h |
| +++ b/third_party/WebKit/Source/modules/accessibility/InspectorAccessibilityAgent.h |
| @@ -12,9 +12,13 @@ |
| namespace blink { |
| class AXObject; |
| +class AXObjectCacheImpl; |
| class InspectorDOMAgent; |
| class Page; |
| +using protocol::Accessibility::AXNode; |
|
dgozman
2016/11/08 16:38:41
Move usings to private section (per style guide).
aboxhall
2016/11/08 18:02:18
I originally had that, but it doesn't compile:
err
|
| +using protocol::Accessibility::AXNodeId; |
| + |
| class MODULES_EXPORT InspectorAccessibilityAgent |
| : public InspectorBaseAgent<protocol::Accessibility::Metainfo> { |
| WTF_MAKE_NONCOPYABLE(InspectorAccessibilityAgent); |
| @@ -26,9 +30,9 @@ class MODULES_EXPORT InspectorAccessibilityAgent |
| DECLARE_VIRTUAL_TRACE(); |
| // Protocol methods. |
| - Response getAXNodeChain( |
| + Response getPartialAXTree( |
| int domNodeId, |
| - bool fetchAncestors, |
| + Maybe<bool> fetchRelatives, |
| std::unique_ptr<protocol::Array<protocol::Accessibility::AXNode>>*) |
| override; |
| @@ -36,12 +40,58 @@ class MODULES_EXPORT InspectorAccessibilityAgent |
| Member<Page> m_page; |
|
dgozman
2016/11/08 16:38:41
Fields should be listed after methods.
aboxhall
2016/11/08 18:02:18
Done.
|
| Member<InspectorDOMAgent> m_domAgent; |
| - std::unique_ptr<protocol::Accessibility::AXNode> buildObjectForIgnoredNode( |
| + std::unique_ptr<AXNode> buildObjectForIgnoredNode( |
| Node* domNode, |
| - AXObject*) const; |
| - std::unique_ptr<protocol::Accessibility::AXNode> buildProtocolAXObject( |
| - AXObject&) const; |
| - void fillCoreProperties(AXObject&, protocol::Accessibility::AXNode&) const; |
| + AXObject*, |
| + bool fetchRelatives, |
| + std::unique_ptr<protocol::Array<AXNode>>& nodes, |
| + AXObjectCacheImpl&) const; |
| + void populateDOMNodeRelatives(Node& inspectedDOMNode, |
| + AXNode&, |
| + std::unique_ptr<protocol::Array<AXNode>>& nodes, |
| + AXObjectCacheImpl&) const; |
| + void findDOMNodeChildren(std::unique_ptr<protocol::Array<AXNodeId>>& childIds, |
| + Node& parentNode, |
| + Node& inspectedDOMNode, |
| + std::unique_ptr<protocol::Array<AXNode>>& nodes, |
| + AXObjectCacheImpl&) const; |
| + std::unique_ptr<AXNode> buildProtocolAXObject( |
| + AXObject&, |
| + AXObject* inspectedAXObject, |
| + bool fetchRelatives, |
| + std::unique_ptr<protocol::Array<AXNode>>& nodes, |
| + AXObjectCacheImpl&) const; |
| + void fillCoreProperties(AXObject&, |
| + AXObject* inspectedAXObject, |
| + bool fetchRelatives, |
| + AXNode&, |
| + std::unique_ptr<protocol::Array<AXNode>>& nodes, |
| + AXObjectCacheImpl&) const; |
| + void addAncestors(AXObject& firstAncestor, |
| + AXObject* inspectedAXObject, |
| + std::unique_ptr<protocol::Array<AXNode>>& nodes, |
| + AXObjectCacheImpl&) const; |
| + void populateRelatives(AXObject&, |
| + AXObject* inspectedAXObject, |
| + AXNode&, |
| + std::unique_ptr<protocol::Array<AXNode>>& nodes, |
| + AXObjectCacheImpl&) const; |
| + void addSiblingsOfIgnored( |
| + std::unique_ptr<protocol::Array<AXNodeId>>& childIds, |
| + AXObject& parentAXObject, |
| + AXObject* inspectedAXObject, |
| + std::unique_ptr<protocol::Array<AXNode>>& nodes, |
| + AXObjectCacheImpl&) const; |
| + void addChild(std::unique_ptr<protocol::Array<AXNodeId>>& childIds, |
| + AXObject& childAXObject, |
| + AXObject* inspectedAXObject, |
| + std::unique_ptr<protocol::Array<AXNode>>& nodes, |
| + AXObjectCacheImpl&) const; |
| + void addChildren(AXObject&, |
| + AXObject* inspectedAXObject, |
| + std::unique_ptr<protocol::Array<AXNodeId>>& childIds, |
| + std::unique_ptr<protocol::Array<AXNode>>& nodes, |
| + AXObjectCacheImpl&) const; |
| }; |
| } // namespace blink |