Add more fine-grained accessibility modes.

content/browser/accessibility/browser_accessibility_state_impl.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 "content/browser/accessibility/browser_accessibility_state_impl.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram_macros.h"
 #include "build/build_config.h"
-#include "content/browser/accessibility/accessibility_mode_helper.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"
 #include "ui/gfx/color_utils.h"
 
 namespace content {
 
 // Update the accessibility histogram 45 seconds after initialization.
 static const int kAccessibilityHistogramDelaySecs = 45;
@@ skipping 40 matching lines @@
 
 void BrowserAccessibilityStateImpl::OnScreenReaderDetected() {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableRendererAccessibility)) {
     return;
   }
   EnableAccessibility();
 }
 
 void BrowserAccessibilityStateImpl::EnableAccessibility() {
-  AddAccessibilityMode(AccessibilityModeComplete);
+  AddAccessibilityModeFlags(kAccessibilityModeComplete);
 }
 
 void BrowserAccessibilityStateImpl::DisableAccessibility() {
   ResetAccessibilityMode();
 }
 
 void BrowserAccessibilityStateImpl::ResetAccessibilityModeValue() {
   accessibility_mode_ = AccessibilityModeOff;
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kForceRendererAccessibility)) {
-    accessibility_mode_ = AccessibilityModeComplete;
+    accessibility_mode_ = kAccessibilityModeComplete;
   }
 }
 
 void BrowserAccessibilityStateImpl::ResetAccessibilityMode() {
   ResetAccessibilityModeValue();
 
   std::vector<WebContentsImpl*> web_contents_vector =
       WebContentsImpl::GetAllWebContents();
   for (size_t i = 0; i < web_contents_vector.size(); ++i)
     web_contents_vector[i]->SetAccessibilityMode(accessibility_mode());
 }
 
 bool BrowserAccessibilityStateImpl::IsAccessibleBrowser() {
-  return ((accessibility_mode_ & AccessibilityModeComplete) ==
-          AccessibilityModeComplete);
+  return ((accessibility_mode_ & kAccessibilityModeComplete) ==
+          kAccessibilityModeComplete);
 }
 
 void BrowserAccessibilityStateImpl::AddHistogramCallback(
     base::Closure callback) {
   histogram_callbacks_.push_back(callback);
 }
 
 void BrowserAccessibilityStateImpl::UpdateHistogramsForTesting() {
   UpdateHistograms();
 }
@@ skipping 10 matching lines @@
   UMA_HISTOGRAM_BOOLEAN("Accessibility.ManuallyEnabled",
                         base::CommandLine::ForCurrentProcess()->HasSwitch(
                             switches::kForceRendererAccessibility));
 }
 
 #if !defined(OS_WIN) && !defined(OS_MACOSX)
 void BrowserAccessibilityStateImpl::UpdatePlatformSpecificHistograms() {
 }
 #endif
 
-void BrowserAccessibilityStateImpl::AddAccessibilityMode(
+void BrowserAccessibilityStateImpl::AddAccessibilityModeFlags(
     AccessibilityMode mode) {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableRendererAccessibility)) {
+    mode &= (AccessibilityModeFlagNativeAPIs |

[aboxhall, 2016/12/12 20:18:29]

Can you explain the change here?

[dmazzoni, 2016/12/12 22:15:36]

Hmmm, I think what I was trying to do was make the
flag affect some modes but not others, but I think I'll
stick with the change description's promise to make this
just a refactoring change and not affect behavior yet.

Reverted this line back to just return, so if you
run with --disable-renderer-accessibility,
no accessibility mode flags will be enabled.

+             AccessibilityModeFlagWebContents);
+  }
+
+  accessibility_mode_ |= mode;
+  std::vector<WebContentsImpl*> web_contents_vector =
+      WebContentsImpl::GetAllWebContents();
+  for (size_t i = 0; i < web_contents_vector.size(); ++i)
+    web_contents_vector[i]->AddAccessibilityMode(accessibility_mode_);
+}
+
+void BrowserAccessibilityStateImpl::RemoveAccessibilityModeFlags(
+    AccessibilityMode mode) {
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kForceRendererAccessibility) &&
+      mode == kAccessibilityModeComplete) {
     return;
   }
 
-  accessibility_mode_ =
-      content::AddAccessibilityModeTo(accessibility_mode_, mode);
-
-  AddOrRemoveFromAllWebContents(mode, true);
-}
-
-void BrowserAccessibilityStateImpl::RemoveAccessibilityMode(
-    AccessibilityMode mode) {
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kForceRendererAccessibility) &&
-      mode == AccessibilityModeComplete) {
-    return;
-  }
-
-  accessibility_mode_ =
-      content::RemoveAccessibilityModeFrom(accessibility_mode_, mode);
-
-  AddOrRemoveFromAllWebContents(mode, false);
-}
-
-void BrowserAccessibilityStateImpl::AddOrRemoveFromAllWebContents(
-    AccessibilityMode mode,
-    bool add) {
+  accessibility_mode_ = accessibility_mode_ ^ (mode & accessibility_mode_);
   std::vector<WebContentsImpl*> web_contents_vector =
       WebContentsImpl::GetAllWebContents();
-  for (size_t i = 0; i < web_contents_vector.size(); ++i) {
-    if (add)
-      web_contents_vector[i]->AddAccessibilityMode(mode);
-    else
-      web_contents_vector[i]->RemoveAccessibilityMode(mode);
-  }
+  for (size_t i = 0; i < web_contents_vector.size(); ++i)
+    web_contents_vector[i]->SetAccessibilityMode(accessibility_mode());
 }
 
 }  // namespace content