Switch AccessibilityMode to be a bitmap

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 "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/timer/timer.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
@@ skipping 62 matching lines @@
 }
 
 BrowserAccessibilityStateImpl::~BrowserAccessibilityStateImpl() {
 }
 
 void BrowserAccessibilityStateImpl::OnScreenReaderDetected() {
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableRendererAccessibility)) {
     return;
   }
-  SetAccessibilityMode(AccessibilityModeComplete);
+  SetAccessibilityMode(accessibility_mode_ | AccessibilityModeComplete);
 }
 
 void BrowserAccessibilityStateImpl::EnableAccessibility() {
   // We may want to do something different with this later.
-  SetAccessibilityMode(AccessibilityModeComplete);
+  SetAccessibilityMode(accessibility_mode_ | AccessibilityModeComplete);
 }
 
 void BrowserAccessibilityStateImpl::DisableAccessibility() {
   SetAccessibilityMode(AccessibilityModeOff);
 }
 
 bool BrowserAccessibilityStateImpl::IsAccessibleBrowser() {
-  return (accessibility_mode_ == AccessibilityModeComplete);
+  return ((accessibility_mode_ & AccessibilityModeComplete) ==
+          AccessibilityModeComplete);
 }
 
 void BrowserAccessibilityStateImpl::AddHistogramCallback(
     base::Closure callback) {
   histogram_callbacks_.push_back(callback);
 }
 
 void BrowserAccessibilityStateImpl::UpdateHistogramsForTesting() {
   UpdateHistograms();
 }
@@ skipping 10 matching lines @@
   UMA_HISTOGRAM_BOOLEAN("Accessibility.ManuallyEnabled",
                         CommandLine::ForCurrentProcess()->HasSwitch(
                             switches::kForceRendererAccessibility));
 }
 
 #if !defined(OS_WIN)
 void BrowserAccessibilityStateImpl::UpdatePlatformSpecificHistograms() {
 }
 #endif
 
-void BrowserAccessibilityStateImpl::SetAccessibilityMode(
-    AccessibilityMode mode) {
+void BrowserAccessibilityStateImpl::SetAccessibilityMode(unsigned int mode) {
   if (accessibility_mode_ == mode)
     return;
   accessibility_mode_ = mode;
 
   // Iterate over all RenderWidgetHosts, even swapped out ones in case
   // they become active again.
   scoped_ptr<RenderWidgetHostIterator> widgets(
       RenderWidgetHostImpl::GetAllRenderWidgetHosts());
   while (RenderWidgetHost* widget = widgets->GetNextHost()) {
     // Ignore processes that don't have a connection, such as crashed tabs.
     if (!widget->GetProcess()->HasConnection())
       continue;
     if (!widget->IsRenderView())
       continue;
 
     RenderWidgetHostImpl::From(widget)->SetAccessibilityMode(mode);
   }
 }
 
+void BrowserAccessibilityStateImpl::SetRendererAccessibilityMode(bool on) {
+  if (bool(accessibility_mode_ & AccessibilityModeFlagRenderer) == on)

[David Tseng, 2014/01/27 22:16:06]

Got it; this still looks cryptic because of the cast; I'd prefer being more
xplicit.

i.e.


bool renderer_set = accessibility_mode_ & AccessibilityModeFlagRenderer ==
AccessibilityModeFlagRenderer;
if (renderer_set == on)...

+    return;
+
+  if (on)

[David Tseng, 2014/01/27 22:16:06]

Ditto; xor

[aboxhall, 2014/01/28 00:18:42]

Done.

+    accessibility_mode_ |= AccessibilityModeFlagRenderer;
+  else
+    accessibility_mode_ &= (~AccessibilityModeFlagRenderer);
+  // Iterate over all RenderWidgetHosts, even swapped out ones in case

[David Tseng, 2014/01/27 22:16:06]

Why not just call through to SetAccessibilityMode here? This is dupped from
there anyway.

[aboxhall, 2014/01/28 00:18:42]

Done, that's much better.

+  // they become active again.
+  scoped_ptr<RenderWidgetHostIterator> widgets(
+      RenderWidgetHostImpl::GetAllRenderWidgetHosts());
+  while (RenderWidgetHost* widget = widgets->GetNextHost()) {
+    // Ignore processes that don't have a connection, such as crashed tabs.
+    if (!widget->GetProcess()->HasConnection())
+      continue;
+    if (!widget->IsRenderView())
+      continue;
+
+    RenderWidgetHostImpl::From(widget)
+        ->SetAccessibilityMode(accessibility_mode_);
+  }
+}
+
 }  // namespace content