Switch to using accessibilityEnabled and inlineTextBoxAccessibilityEnabled from settings

Source/core/accessibility/AXRenderObject.cpp

Index: Source/core/accessibility/AXRenderObject.cpp
diff --git a/Source/core/accessibility/AXRenderObject.cpp b/Source/core/accessibility/AXRenderObject.cpp
index a3106b22c7cba331614e7dc8e9cbf8efd4923b1f..c7f39a800f3274eaffc5777877af28a7217f37bf 100644
--- a/Source/core/accessibility/AXRenderObject.cpp
+++ b/Source/core/accessibility/AXRenderObject.cpp
@@ -44,6 +44,7 @@
 #include "core/editing/VisibleUnits.h"
 #include "core/editing/htmlediting.h"
 #include "core/frame/LocalFrame.h"
+#include "core/frame/Settings.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/html/HTMLLabelElement.h"
 #include "core/html/HTMLOptionElement.h"
@@ -1686,7 +1687,7 @@ void AXRenderObject::textChanged()
     if (!m_renderer)
         return;
 
-    if (AXObjectCache::inlineTextBoxAccessibility() && roleValue() == StaticTextRole)
+    if (document()->settings() && document()->settings()->inlineTextBoxAccessibilityEnabled() && roleValue() == StaticTextRole)
         childrenChanged();
 
     // Do this last - AXNodeObject::textChanged posts live region announcements,
@@ -1763,13 +1764,18 @@ int AXRenderObject::indexForVisiblePosition(const VisiblePosition& pos) const
 
 void AXRenderObject::addInlineTextBoxChildren()
 {
-    if (!axObjectCache()->inlineTextBoxAccessibility())
+    fprintf(stderr, "addInlineTextBoxChildren\n");
+    if (!document()->settings() || !document()->settings()->inlineTextBoxAccessibilityEnabled()) {
+      fprintf(stderr, "document->settings(): %p; document->settings()->inlineTextBoxAccessibilityEnabled(): %d\n", document()->settings(), document()->settings() ? document()->settings()->inlineTextBoxAccessibilityEnabled() : 0);
         return;
+    }
 
-    if (!renderer() || !renderer()->isText())
+    if (!renderer() || !renderer()->isText()) {
+        fprintf(stderr, "!renderer() %p || !renderer()->isText()\n", renderer());
         return;
-
+    }
     if (renderer()->needsLayout()) {
+        fprintf(stderr, "needsLayout\n");
         // If a RenderText needs layout, its inline text boxes are either
         // nonexistent or invalid, so defer until the layout happens and
         // the renderer calls AXObjectCache::inlineTextBoxesUpdated.
@@ -1779,8 +1785,11 @@ void AXRenderObject::addInlineTextBoxChildren()
     RenderText* renderText = toRenderText(renderer());
     for (RefPtr<AbstractInlineTextBox> box = renderText->firstAbstractInlineTextBox(); box.get(); box = box->nextInlineTextBox()) {
         AXObject* axObject = axObjectCache()->getOrCreate(box.get());
+        fprintf(stderr, "found textbox\n");
         if (!axObject->accessibilityIsIgnored())
             m_children.append(axObject);
+        else
+          fprintf(stderr, "accessibilityIsIgnored\n");
     }
 }