Switch to using accessibilityEnabled and inlineTextBoxAccessibilityEnabled from settings

Source/core/accessibility/AXObjectCache.h

Index: Source/core/accessibility/AXObjectCache.h
diff --git a/Source/core/accessibility/AXObjectCache.h b/Source/core/accessibility/AXObjectCache.h
index 69a398bfaa3caf07944c4bad84e8aed60339dcd8..becb6175705fc8e055440fc9e36db2b481dbda4a 100644
--- a/Source/core/accessibility/AXObjectCache.h
+++ b/Source/core/accessibility/AXObjectCache.h
@@ -43,6 +43,7 @@ class Node;
 class Page;
 class RenderObject;
 class ScrollView;
+class Settings;
 class VisiblePosition;
 class Widget;
 
@@ -145,10 +146,8 @@ public:
 
     void inlineTextBoxesUpdated(RenderObject* renderer);
 
-    static void enableAccessibility() { gAccessibilityEnabled = true; }
-    static bool accessibilityEnabled() { return gAccessibilityEnabled; }
-    static void setInlineTextBoxAccessibility(bool flag) { gInlineTextBoxAccessibility = flag; }
-    static bool inlineTextBoxAccessibility() { return gInlineTextBoxAccessibility; }
+    bool accessibilityEnabled();
+    bool inlineTextBoxAccessibilityEnabled();
 
     void removeAXID(AXObject*);
     bool isIDinUse(AXID id) const { return m_idsInUse.contains(id); }
@@ -213,6 +212,7 @@ protected:
 
 private:
     Document& m_document;
+    Settings* m_settings;
     HashMap<AXID, RefPtr<AXObject> > m_objects;
     HashMap<RenderObject*, AXID> m_renderObjectMapping;
     HashMap<Widget*, AXID> m_widgetObjectMapping;
@@ -220,8 +220,6 @@ private:
     HashMap<AbstractInlineTextBox*, AXID> m_inlineTextBoxObjectMapping;
     HashSet<Node*> m_textMarkerNodes;
     OwnPtr<AXComputedObjectAttributeCache> m_computedObjectAttributeCache;
-    static bool gAccessibilityEnabled;
-    static bool gInlineTextBoxAccessibility;
 
     HashSet<AXID> m_idsInUse;
 
@@ -232,6 +230,8 @@ private:
     static AXObject* focusedImageMapUIElement(HTMLAreaElement*);
 
     AXID getAXID(AXObject*);
+
+    Settings* getSettings();

[abarth-chromium, 2014/08/29 18:32:07]

s/getSettings/settings/

We usually skip the "get" prefix because it has no meaning.

[aboxhall, 2014/08/29 18:38:39]

I deliberately used 'get' as it's not a trivial getter. Happy to remove it if it
LGTY without.

 };
 
 bool nodeHasRole(Node*, const String& role);