Switch to using accessibilityEnabled and inlineTextBoxAccessibilityEnabled from settings

Source/core/accessibility/AXObjectCache.cpp

 /*
  * Copyright (C) 2008, 2009, 2010 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
@@ skipping 39 matching lines @@
 #include "core/accessibility/AXScrollbar.h"
 #include "core/accessibility/AXSlider.h"
 #include "core/accessibility/AXSpinButton.h"
 #include "core/accessibility/AXTable.h"
 #include "core/accessibility/AXTableCell.h"
 #include "core/accessibility/AXTableColumn.h"
 #include "core/accessibility/AXTableHeaderContainer.h"
 #include "core/accessibility/AXTableRow.h"
 #include "core/dom/Document.h"
 #include "core/frame/LocalFrame.h"
+#include "core/frame/Settings.h"
 #include "core/html/HTMLAreaElement.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/html/HTMLLabelElement.h"
 #include "core/page/Chrome.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/FocusController.h"
 #include "core/page/Page.h"
 #include "core/rendering/AbstractInlineTextBox.h"
 #include "core/rendering/RenderListBox.h"
@@ skipping 27 matching lines @@
         attributes.ignored = inclusion;
         m_idMapping.set(id, attributes);
     }
 }
 
 void AXComputedObjectAttributeCache::clear()
 {
     m_idMapping.clear();
 }
 
-bool AXObjectCache::gAccessibilityEnabled = false;
-bool AXObjectCache::gInlineTextBoxAccessibility = false;
-
 AXObjectCache::AXObjectCache(Document& document)
     : m_document(document)
     , m_notificationPostTimer(this, &AXObjectCache::notificationPostTimerFired)
 {
     m_computedObjectAttributeCache = AXComputedObjectAttributeCache::create();
 }
 
 AXObjectCache::~AXObjectCache()
 {
     m_notificationPostTimer.stop();
@@ skipping 31 matching lines @@
 
         if (toAXImageMapLink(child)->areaElement() == areaElement)
             return child;
     }
 
     return 0;
 }
 
 AXObject* AXObjectCache::focusedUIElementForPage(const Page* page)
 {
-    if (!gAccessibilityEnabled)
+    if (!page->settings().accessibilityEnabled())
         return 0;
 
     // Cross-process accessibility is not yet implemented.
     if (!page->focusController().focusedOrMainFrame()->isLocalFrame())
         return 0;
 
     // get the focused node in the page
     Document* focusedDocument = toLocalFrame(page->focusController().focusedOrMainFrame())->document();
     Node* focusedNode = focusedDocument->focusedElement();
     if (!focusedNode)
@@ skipping 272 matching lines @@
     m_objects.set(newObj->axObjectID(), newObj);
     newObj->init();
     attachWrapper(newObj.get());
     newObj->setLastKnownIsIgnoredValue(newObj->accessibilityIsIgnored());
 
     return newObj.get();
 }
 
 AXObject* AXObjectCache::rootObject()
 {
-    if (!gAccessibilityEnabled)
+    if (!accessibilityEnabled())
         return 0;
 
     return getOrCreate(m_document.view());
 }
 
 AXObject* AXObjectCache::getOrCreate(AccessibilityRole role)
 {
     RefPtr<AXObject> obj = nullptr;
 
     // will be filled in...
@@ skipping 428 matching lines @@
 }
 
 void AXObjectCache::recomputeIsIgnored(RenderObject* renderer)
 {
     if (AXObject* obj = get(renderer))
         obj->notifyIfIgnoredValueChanged();
 }
 
 void AXObjectCache::inlineTextBoxesUpdated(RenderObject* renderer)
 {
-    if (!gInlineTextBoxAccessibility)
+    if (!inlineTextBoxAccessibilityEnabled())
         return;
 
     // Only update if the accessibility object already exists and it's
     // not already marked as dirty.
     if (AXObject* obj = get(renderer)) {
         if (!obj->needsToUpdateChildren()) {
             obj->setNeedsToUpdateChildren();
             postNotification(renderer, AXChildrenChanged, true);
         }
     }
 }
 
+Settings* AXObjectCache::getSettings()
+{
+    if (m_settings)
+        return m_settings;
+    m_settings = m_document.settings();
+    return m_settings;

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

Why store a pointer to m_settings?  You can just get it from m_document.

[aboxhall, 2014/08/29 20:35:16]

Done.

+}
+
+bool AXObjectCache::accessibilityEnabled()
+{
+    Settings* settings = getSettings();
+    if (!settings)
+        return false;
+    return settings->accessibilityEnabled();
+}
+
+bool AXObjectCache::inlineTextBoxAccessibilityEnabled()
+{
+    Settings* settings = getSettings();
+    if (!settings)
+        return false;
+    return settings->inlineTextBoxAccessibilityEnabled();
+}
+
 const Element* AXObjectCache::rootAXEditableElement(const Node* node)
 {
     const Element* result = node->rootEditableElement();
     const Element* element = node->isElementNode() ? toElement(node) : node->parentElement();
 
     for (; element; element = element->parentElement()) {
         if (nodeIsTextControl(element))
             result = element;
     }
 
@@ skipping 95 matching lines @@
 void AXObjectCache::setCanvasObjectBounds(Element* element, const LayoutRect& rect)
 {
     AXObject* obj = getOrCreate(element);
     if (!obj)
         return;
 
     obj->setElementRect(rect);
 }
 
 } // namespace blink