Index: third_party/WebKit/Source/modules/accessibility/AXNodeObject.h |
diff --git a/third_party/WebKit/Source/modules/accessibility/AXNodeObject.h b/third_party/WebKit/Source/modules/accessibility/AXNodeObject.h |
index 3a27ceecf3c364dc9a15592a0ec3fe2cb73c9c8d..8ecc92e9e52a10eebf3db5bf38c53245daf74d43 100644 |
--- a/third_party/WebKit/Source/modules/accessibility/AXNodeObject.h |
+++ b/third_party/WebKit/Source/modules/accessibility/AXNodeObject.h |
@@ -30,7 +30,7 @@ |
#define AXNodeObject_h |
#include "modules/ModulesExport.h" |
-#include "modules/accessibility/AXObject.h" |
+#include "modules/accessibility/AXObjectImpl.h" |
#include "platform/wtf/Forward.h" |
namespace blink { |
@@ -40,7 +40,7 @@ class Element; |
class HTMLLabelElement; |
class Node; |
-class MODULES_EXPORT AXNodeObject : public AXObject { |
+class MODULES_EXPORT AXNodeObject : public AXObjectImpl { |
WTF_MAKE_NONCOPYABLE(AXNodeObject); |
protected: |
@@ -60,35 +60,35 @@ class MODULES_EXPORT AXNodeObject : public AXObject { |
#endif |
bool ComputeAccessibilityIsIgnored(IgnoredReasons* = nullptr) const override; |
- const AXObject* InheritsPresentationalRoleFrom() const override; |
+ const AXObjectImpl* InheritsPresentationalRoleFrom() const override; |
virtual AccessibilityRole DetermineAccessibilityRole(); |
virtual AccessibilityRole NativeAccessibilityRoleIgnoringAria() const; |
String AccessibilityDescriptionForElements( |
HeapVector<Member<Element>>& elements) const; |
void AlterSliderValue(bool increase); |
- AXObject* ActiveDescendant() override; |
+ AXObjectImpl* ActiveDescendant() override; |
String AriaAccessibilityDescription() const; |
String AriaAutoComplete() const; |
AccessibilityRole DetermineAriaRoleAttribute() const; |
void AccessibilityChildrenFromAttribute(QualifiedName attr, |
- AXObject::AXObjectVector&) const; |
+ AXObjectImpl::AXObjectVector&) const; |
bool HasContentEditableAttributeSet() const; |
bool IsTextControl() const override; |
// This returns true if it's focusable but it's not content editable and it's |
// not a control or ARIA control. |
bool IsGenericFocusableElement() const; |
- AXObject* MenuButtonForMenu() const; |
+ AXObjectImpl* MenuButtonForMenu() const; |
Element* MenuItemElementForMenu() const; |
Element* MouseButtonListener() const; |
AccessibilityRole RemapAriaRoleDueToParent(AccessibilityRole) const; |
bool IsNativeCheckboxOrRadio() const; |
void SetNode(Node*); |
- AXObject* CorrespondingControlForLabelElement() const; |
+ AXObjectImpl* CorrespondingControlForLabelElement() const; |
HTMLLabelElement* LabelElementContainer() const; |
// |
- // Overridden from AXObject. |
+ // Overridden from AXObjectImpl. |
// |
void Init() override; |
@@ -146,7 +146,7 @@ class MODULES_EXPORT AXNodeObject : public AXObject { |
unsigned HierarchicalLevel() const final; |
void Markers(Vector<DocumentMarker::MarkerType>&, |
Vector<AXRange>&) const override; |
- AXObject* InPageLinkTarget() const override; |
+ AXObjectImpl* InPageLinkTarget() const override; |
AccessibilityOrientation Orientation() const override; |
AXObjectVector RadioButtonsInGroup() const override; |
static HeapVector<Member<HTMLInputElement>> FindAllRadioButtonsWithSameName( |
@@ -186,21 +186,21 @@ class MODULES_EXPORT AXNodeObject : public AXObject { |
bool NameFromContents() const override; |
// Location |
- void GetRelativeBounds(AXObject** out_container, |
+ void GetRelativeBounds(AXObjectImpl** out_container, |
FloatRect& out_bounds_in_container, |
SkMatrix44& out_container_transform) const override; |
// High-level accessibility tree access. |
- AXObject* ComputeParent() const override; |
- AXObject* ComputeParentIfExists() const override; |
+ AXObjectImpl* ComputeParent() const override; |
+ AXObjectImpl* ComputeParentIfExists() const override; |
// Low-level accessibility tree exploration. |
- AXObject* RawFirstChild() const override; |
- AXObject* RawNextSibling() const override; |
+ AXObjectImpl* RawFirstChild() const override; |
+ AXObjectImpl* RawNextSibling() const override; |
void AddChildren() override; |
bool CanHaveChildren() const override; |
- void AddChild(AXObject*); |
- void InsertChild(AXObject*, unsigned index); |
+ void AddChild(AXObjectImpl*); |
+ void InsertChild(AXObjectImpl*, unsigned index); |
// DOM and Render tree access. |
Element* ActionElement() const override; |
@@ -226,7 +226,7 @@ class MODULES_EXPORT AXNodeObject : public AXObject { |
// Aria-owns. |
void ComputeAriaOwnsChildren( |
- HeapVector<Member<AXObject>>& owned_children) const; |
+ HeapVector<Member<AXObjectImpl>>& owned_children) const; |
private: |
Member<Node> node_; |