Chromium Code Reviews| Index: Source/modules/accessibility/AXObject.h |
| diff --git a/Source/modules/accessibility/AXObject.h b/Source/modules/accessibility/AXObject.h |
| index efaa8a6f0c50b4a9def0b351a6528d5e889cefe3..ad86e52f7d72f127f2d7fb4185bc834194ca2089 100644 |
| --- a/Source/modules/accessibility/AXObject.h |
| +++ b/Source/modules/accessibility/AXObject.h |
| @@ -40,6 +40,7 @@ |
| namespace blink { |
| class AXObject; |
| +class AXObjectCache; |
| class AXObjectCacheImpl; |
| class Element; |
| class FrameView; |
| @@ -52,6 +53,7 @@ class Widget; |
| typedef unsigned AXID; |
| enum AccessibilityRole { |
| + NoRole = 0, |
|
dmazzoni
2014/12/09 00:49:51
I still vote for reusing UnknownRole rather than i
aboxhall
2014/12/13 01:38:36
Is that accurate? It seems to compile and run fine
dmazzoni
2014/12/16 19:18:19
Switch statements on enums should always explicitl
aboxhall
2014/12/16 23:56:37
Done.
|
| AlertDialogRole = 1, |
| AlertRole, |
| AnnotationRole, |
| @@ -167,6 +169,7 @@ enum AccessibilityRole { |
| UserInterfaceTooltipRole, |
| WebAreaRole, |
| WindowRole, |
| + NumRoles |
| }; |
| enum AccessibilityTextSource { |
| @@ -281,7 +284,7 @@ public: |
| }; |
| protected: |
| - AXObject(); |
| + AXObject(AXObjectCache*); |
| public: |
| virtual ~AXObject(); |
| @@ -576,6 +579,7 @@ public: |
| static bool isARIAInput(AccessibilityRole); |
| static AccessibilityRole ariaRoleToWebCoreRole(const String&); |
| static IntRect boundingBoxForQuads(RenderObject*, const Vector<FloatQuad>&); |
| + static const AtomicString& roleName(const AccessibilityRole); |
| protected: |
| AXID m_id; |
| @@ -606,6 +610,8 @@ protected: |
| mutable bool m_cachedIsIgnored; |
| mutable const AXObject* m_cachedLiveRegionRoot; |
| + AXObjectCacheImpl* m_axObjectCache; |
| + |
| // Updates the cached attribute values. This may be recursive, so to prevent deadlocks, |
| // functions called here may only search up the tree (ancestors), not down. |
| void updateCachedAttributeValuesIfNeeded() const; |