Check RendererAccessibility mode instead of WebKit accessibilityEnabled.

content/renderer/renderer_accessibility.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "content/public/common/content_switches.h"
 #include "content/renderer/render_view_impl.h"
 #include "content/renderer/renderer_accessibility.h"
@@ skipping 105 matching lines @@
     IPC_MESSAGE_HANDLER(AccessibilityMsg_ScrollToPoint,
                         OnScrollToPoint)
     IPC_MESSAGE_HANDLER(AccessibilityMsg_SetTextSelection,
                         OnSetTextSelection)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void RendererAccessibility::FocusedNodeChanged(const WebNode& node) {
-  if (!WebAccessibilityObject::accessibilityEnabled())
+  if (mode_ == AccessibilityModeOff)
     return;
 
   const WebDocument& document = GetMainDocument();
   if (document.isNull())
     return;
 
   if (node.isNull()) {
     // When focus is cleared, implicitly focus the document.
     // TODO(dmazzoni): Make WebKit send this notification instead.
     PostAccessibilityNotification(
         document.accessibilityObject(),
         AccessibilityNotificationBlur);
   }
 }
 
 void RendererAccessibility::DidFinishLoad(WebKit::WebFrame* frame) {
-  if (!WebAccessibilityObject::accessibilityEnabled())
+  if (mode_ == AccessibilityModeOff)
     return;
 
   const WebDocument& document = GetMainDocument();
   if (document.isNull())
     return;
 
   // Check to see if the root accessibility object has changed, to work
   // around WebKit bugs that cause AXObjectCache to be cleared
   // unnecessarily.
   // TODO(dmazzoni): remove this once rdar://5794454 is fixed.
@@ skipping 13 matching lines @@
       notification, &temp)) {
     return;
   }
 
   PostAccessibilityNotification(obj, temp);
 }
 
 void RendererAccessibility::PostAccessibilityNotification(
     const WebKit::WebAccessibilityObject& obj,
     AccessibilityNotification notification) {
-  if (!WebAccessibilityObject::accessibilityEnabled())
+  if (mode_ == AccessibilityModeOff)
     return;
 
   const WebDocument& document = GetMainDocument();
   if (document.isNull())
     return;
 
   gfx::Size scroll_offset = document.frame()->scrollOffset();
   if (scroll_offset != last_scroll_offset_) {
     // Make sure the browser is always aware of the scroll position of
     // the root document element by posting a generic notification that
@@ skipping 29 matching lines @@
     // up additional notifications.
     MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(
             &RendererAccessibility::SendPendingAccessibilityNotifications,
             weak_factory_.GetWeakPtr()));
   }
 }
 
 void RendererAccessibility::SendPendingAccessibilityNotifications() {
+  if (mode_ == AccessibilityModeOff)
+    return;
+
   const WebDocument& document = GetMainDocument();
   if (document.isNull())
     return;
 
   if (pending_notifications_.empty())
     return;
 
   ack_pending_ = true;
 
   // Make a copy of the notifications, because it's possible that
@@ skipping 137 matching lines @@
     BrowserTreeNode* browser_node) {
   for (size_t i = 0; i < browser_node->children.size(); ++i) {
     browser_id_map_.erase(browser_node->children[i]->id);
     ClearBrowserTreeNode(browser_node->children[i]);
     delete browser_node->children[i];
   }
   browser_node->children.clear();
 }
 
 void RendererAccessibility::OnDoDefaultAction(int acc_obj_id) {
-  if (!WebAccessibilityObject::accessibilityEnabled())
+  if (mode_ == AccessibilityModeOff)
     return;
 
   const WebDocument& document = GetMainDocument();
   if (document.isNull())
     return;
 
   WebAccessibilityObject obj = document.accessibilityObjectFromID(acc_obj_id);
   if (!obj.isValid()) {
 #ifndef NDEBUG
     if (logging_)
       LOG(WARNING) << "DoDefaultAction on invalid object id " << acc_obj_id;
 #endif
     return;
   }
 
   obj.performDefaultAction();
 }
 
 void RendererAccessibility::OnScrollToMakeVisible(
     int acc_obj_id, gfx::Rect subfocus) {
-  if (!WebAccessibilityObject::accessibilityEnabled())
+  if (mode_ == AccessibilityModeOff)
     return;
 
   const WebDocument& document = GetMainDocument();
   if (document.isNull())
     return;
 
   WebAccessibilityObject obj = document.accessibilityObjectFromID(acc_obj_id);
   if (!obj.isValid()) {
 #ifndef NDEBUG
     if (logging_)
@@ skipping 10 matching lines @@
   // position actually changes.
   // TODO(dmazzoni): remove this once this bug is fixed:
   // https://bugs.webkit.org/show_bug.cgi?id=73460
   PostAccessibilityNotification(
       document.accessibilityObject(),
       WebKit::WebAccessibilityNotificationLayoutComplete);
 }
 
 void RendererAccessibility::OnScrollToPoint(
     int acc_obj_id, gfx::Point point) {
-  if (!WebAccessibilityObject::accessibilityEnabled())
+  if (mode_ == AccessibilityModeOff)
     return;
 
   const WebDocument& document = GetMainDocument();
   if (document.isNull())
     return;
 
   WebAccessibilityObject obj = document.accessibilityObjectFromID(acc_obj_id);
   if (!obj.isValid()) {
 #ifndef NDEBUG
     if (logging_)
       LOG(WARNING) << "ScrollToPoint on invalid object id " << acc_obj_id;
 #endif
     return;
   }
 
   obj.scrollToGlobalPoint(WebPoint(point.x(), point.y()));
 
   // Make sure the browser gets a notification when the scroll
   // position actually changes.
   // TODO(dmazzoni): remove this once this bug is fixed:
   // https://bugs.webkit.org/show_bug.cgi?id=73460
   PostAccessibilityNotification(
       document.accessibilityObject(),
       WebKit::WebAccessibilityNotificationLayoutComplete);
 }
 
 void RendererAccessibility::OnSetTextSelection(
     int acc_obj_id, int start_offset, int end_offset) {
-  if (!WebAccessibilityObject::accessibilityEnabled())
+  if (mode_ == AccessibilityModeOff)
     return;
 
   const WebDocument& document = GetMainDocument();
   if (document.isNull())
     return;
 
   WebAccessibilityObject obj = document.accessibilityObjectFromID(acc_obj_id);
   if (!obj.isValid()) {
 #ifndef NDEBUG
     if (logging_)
@@ skipping 38 matching lines @@
     // It's possible that the webview has already loaded a webpage without
     // accessibility being enabled. Initialize the browser's cached
     // accessibility tree by sending it a 'load complete' notification.
     PostAccessibilityNotification(
         document.accessibilityObject(),
         WebKit::WebAccessibilityNotificationLayoutComplete);
   }
 }
 
 void RendererAccessibility::OnSetFocus(int acc_obj_id) {
-  if (!WebAccessibilityObject::accessibilityEnabled())
+  if (mode_ == AccessibilityModeOff)
     return;
 
   const WebDocument& document = GetMainDocument();
   if (document.isNull())
     return;
 
   WebAccessibilityObject obj = document.accessibilityObjectFromID(acc_obj_id);
   if (!obj.isValid()) {
 #ifndef NDEBUG
     if (logging_) {
@@ skipping 140 matching lines @@
     case AccessibilityNotificationTextRemoved:
       return "text removed";
     case AccessibilityNotificationValueChanged:
       return "value changed";
     default:
       NOTREACHED();
   }
   return "";
 }
 #endif