Switch to using accessibilityEnabled and inlineTextBoxAccessibilityEnabled from settings

Source/core/accessibility/AXObjectCache.h

 /*
  * Copyright (C) 2003, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 25 matching lines @@
 
 namespace blink {
 
 class AbstractInlineTextBox;
 class Document;
 class HTMLAreaElement;
 class Node;
 class Page;
 class RenderObject;
 class ScrollView;
+class Settings;
 class VisiblePosition;
 class Widget;
 
 struct TextMarkerData {
     AXID axID;
     Node* node;
     int offset;
     EAffinity affinity;
 };
 
@@ skipping 82 matching lines @@
 
     // Called when the scroll offset changes.
     void handleScrollPositionChanged(ScrollView*);
     void handleScrollPositionChanged(RenderObject*);
 
     void handleAttributeChanged(const QualifiedName& attrName, Element*);
     void recomputeIsIgnored(RenderObject* renderer);
 
     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); }
 
     Element* rootAXEditableElement(Node*);
     const Element* rootAXEditableElement(const Node*);
     bool nodeIsTextControl(const Node*);
 
     AXID platformGenerateAXID() const;
     AXObject* objectFromAXID(AXID id) const { return m_objects.get(id); }
@@ skipping 44 matching lines @@
     void textChanged(AXObject*);
     void labelChanged(Element*);
 
     // This is a weak reference cache for knowing if Nodes used by TextMarkers are valid.
     void setNodeInUse(Node* n) { m_textMarkerNodes.add(n); }
     void removeNodeForUse(Node* n) { m_textMarkerNodes.remove(n); }
     bool isNodeInUse(Node* n) { return m_textMarkerNodes.contains(n); }
 
 private:
     Document& m_document;
+    Settings* m_settings;
     HashMap<AXID, RefPtr<AXObject> > m_objects;
     HashMap<RenderObject*, AXID> m_renderObjectMapping;
     HashMap<Widget*, AXID> m_widgetObjectMapping;
     HashMap<Node*, AXID> m_nodeObjectMapping;
     HashMap<AbstractInlineTextBox*, AXID> m_inlineTextBoxObjectMapping;
     HashSet<Node*> m_textMarkerNodes;
     OwnPtr<AXComputedObjectAttributeCache> m_computedObjectAttributeCache;
-    static bool gAccessibilityEnabled;
-    static bool gInlineTextBoxAccessibility;
 
     HashSet<AXID> m_idsInUse;
 
     Timer<AXObjectCache> m_notificationPostTimer;
     Vector<pair<RefPtr<AXObject>, AXNotification> > m_notificationsToPost;
     void notificationPostTimerFired(Timer<AXObjectCache>*);
 
     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);
 // This will let you know if aria-hidden was explicitly set to false.
 bool isNodeAriaVisible(Node*);
 
 }
 
 #endif