Chromium Code Reviews| Index: Source/modules/accessibility/AXObject.h |
| diff --git a/Source/modules/accessibility/AXObject.h b/Source/modules/accessibility/AXObject.h |
| index 9f5ad675b2c273a5bf1178d2f5ae3dff41bf7667..4ae418620d81249f2b775e9ce166f20134985ccb 100644 |
| --- a/Source/modules/accessibility/AXObject.h |
| +++ b/Source/modules/accessibility/AXObject.h |
| @@ -30,6 +30,7 @@ |
| #ifndef AXObject_h |
| #define AXObject_h |
| +#include "core/InspectorTypeBuilder.h" |
| #include "core/editing/VisiblePosition.h" |
| #include "modules/ModulesExport.h" |
| #include "platform/geometry/FloatQuad.h" |
| @@ -443,16 +444,17 @@ public: |
| // Whether objects are ignored, i.e. not included in the tree. |
| bool accessibilityIsIgnored() const; |
| - bool accessibilityIsIgnoredByDefault() const; |
| + virtual bool computeAccessibilityIsIgnored(PassRefPtr<TypeBuilder::Array<TypeBuilder::Accessibility::AXProperty>> = PassRefPtr<TypeBuilder::Array<TypeBuilder::Accessibility::AXProperty>>()) const { return true; } |
|
dmazzoni
2015/04/15 17:00:02
How about a typedef for PassRefPtr<TypeBuilder::Ar
aboxhall
2015/04/15 17:55:46
Done.
|
| + bool accessibilityIsIgnoredByDefault(PassRefPtr<TypeBuilder::Array<TypeBuilder::Accessibility::AXProperty>> = PassRefPtr<TypeBuilder::Array<TypeBuilder::Accessibility::AXProperty>>()) const; |
|
dmazzoni
2015/04/15 17:00:02
accessibilityIsIgnoredByDefault hardly does anythi
aboxhall
2015/04/15 17:55:46
Ok, working on that now.
|
| AXObjectInclusion accessibilityPlatformIncludesObject() const; |
| - virtual AXObjectInclusion defaultObjectInclusion() const; |
| + virtual AXObjectInclusion defaultObjectInclusion(PassRefPtr<TypeBuilder::Array<TypeBuilder::Accessibility::AXProperty>> = PassRefPtr<TypeBuilder::Array<TypeBuilder::Accessibility::AXProperty>>()) const; |
| bool isInertOrAriaHidden() const; |
| const AXObject* ariaHiddenRoot() const; |
| - bool computeIsInertOrAriaHidden() const; |
| - bool isDescendantOfBarrenParent() const; |
| - bool computeIsDescendantOfBarrenParent() const; |
| + bool computeIsInertOrAriaHidden(PassRefPtr<TypeBuilder::Array<TypeBuilder::Accessibility::AXProperty>> = PassRefPtr<TypeBuilder::Array<TypeBuilder::Accessibility::AXProperty>>()) const; |
| + bool isDescendantOfLeafNode() const; |
|
dmazzoni
2015/04/15 17:00:02
This sounds great, but let's split the renames int
aboxhall
2015/04/15 17:55:46
I can do that, but note that it's a type change fo
|
| + AXObject* leafNodeAncestor() const; |
| bool isDescendantOfDisabledNode() const; |
| - bool computeIsDescendantOfDisabledNode() const; |
| + const AXObject* disabledAncestor() const; |
| bool lastKnownIsIgnoredValue(); |
| void setLastKnownIsIgnoredValue(bool); |
| @@ -548,7 +550,7 @@ public: |
| virtual AccessibilityRole ariaRoleAttribute() const { return UnknownRole; } |
| virtual bool ariaRoleHasPresentationalChildren() const { return false; } |
| virtual AccessibilityOptionalBool isAriaGrabbed() const { return OptionalBoolUndefined; } |
| - virtual bool isPresentationalChildOfAriaRole() const { return false; } |
| + virtual AXObject* ancestorForWhichThisIsAPresentationalChild() const { return 0; } |
| virtual bool shouldFocusActiveDescendant() const { return false; } |
| bool supportsARIAAttributes() const; |
| virtual bool supportsARIADragging() const { return false; } |
| @@ -681,8 +683,7 @@ protected: |
| AXObjectInclusion m_lastKnownIsIgnoredValue; |
| LayoutRect m_explicitElementRect; |
| - virtual bool computeAccessibilityIsIgnored() const { return true; } |
| - virtual bool computeHasInheritedPresentationalRole() const { return false; } |
| + virtual AXObject* inheritsPresentationalRoleFrom() const { return 0; } |
| // If this object itself scrolls, return its ScrollableArea. |
| virtual ScrollableArea* getScrollableAreaIfScrollable() const { return 0; } |
| @@ -702,7 +703,7 @@ protected: |
| mutable int m_lastModificationCount; |
| mutable bool m_cachedIsIgnored : 1; |
| mutable bool m_cachedIsInertOrAriaHidden : 1; |
| - mutable bool m_cachedIsDescendantOfBarrenParent : 1; |
| + mutable bool m_cachedIsDescendantOfLeafNode : 1; |
| mutable bool m_cachedIsDescendantOfDisabledNode : 1; |
| mutable bool m_cachedHasInheritedPresentationalRole : 1; |
| mutable const AXObject* m_cachedLiveRegionRoot; |