| Index: third_party/WebKit/Source/modules/accessibility/AXObject.h
|
| diff --git a/third_party/WebKit/Source/modules/accessibility/AXObject.h b/third_party/WebKit/Source/modules/accessibility/AXObject.h
|
| index fc3f607fff55e0669b1058ea5a298c2f026162aa..753d2085263cabe6c23e5993be6e622efc3296cf 100644
|
| --- a/third_party/WebKit/Source/modules/accessibility/AXObject.h
|
| +++ b/third_party/WebKit/Source/modules/accessibility/AXObject.h
|
| @@ -53,6 +53,7 @@ class Node;
|
| class LayoutObject;
|
| class ScrollableArea;
|
|
|
| +enum class AOMBooleanProperty;
|
| enum class AOMStringProperty;
|
|
|
| typedef unsigned AXID;
|
| @@ -604,9 +605,10 @@ class MODULES_EXPORT AXObject : public GarbageCollectedFinalized<AXObject> {
|
|
|
| // Wrappers that retrieve either an Accessibility Object Model property,
|
| // or the equivalent ARIA attribute, in that order.
|
| - // TODO(dmazzoni): Add equivalents for other types of properties besides
|
| - // just strings.
|
| const AtomicString& GetAOMPropertyOrARIAAttribute(AOMStringProperty) const;
|
| + bool HasAOMPropertyOrARIAAttribute(AOMBooleanProperty, bool& result) const;
|
| + bool AOMPropertyOrARIAAttributeIsTrue(AOMBooleanProperty) const;
|
| + bool AOMPropertyOrARIAAttributeIsFalse(AOMBooleanProperty) const;
|
|
|
| virtual void GetSparseAXAttributes(AXSparseAttributeClient&) const {}
|
|
|
| @@ -977,12 +979,13 @@ class MODULES_EXPORT AXObject : public GarbageCollectedFinalized<AXObject> {
|
| virtual double EstimatedLoadingProgress() const { return 0; }
|
|
|
| // DOM and layout tree access.
|
| - virtual Node* GetNode() const { return 0; }
|
| - virtual LayoutObject* GetLayoutObject() const { return 0; }
|
| + virtual Node* GetNode() const { return nullptr; }
|
| + virtual Element* GetElement() const; // Same as GetNode, if it's an Element.
|
| + virtual LayoutObject* GetLayoutObject() const { return nullptr; }
|
| virtual Document* GetDocument() const;
|
| virtual FrameView* DocumentFrameView() const;
|
| - virtual Element* AnchorElement() const { return 0; }
|
| - virtual Element* ActionElement() const { return 0; }
|
| + virtual Element* AnchorElement() const { return nullptr; }
|
| + virtual Element* ActionElement() const { return nullptr; }
|
| String Language() const;
|
| bool HasAttribute(const QualifiedName&) const;
|
| const AtomicString& GetAttribute(const QualifiedName&) const;
|
|
|