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 18 matching lines @@
 }
 
 // static
 BrowserAccessibilityStateImpl* BrowserAccessibilityStateImpl::GetInstance() {
   return Singleton<BrowserAccessibilityStateImpl,
                    LeakySingletonTraits<BrowserAccessibilityStateImpl> >::get();
 }
 
 BrowserAccessibilityStateImpl::BrowserAccessibilityStateImpl()
     : BrowserAccessibilityState(),
-      accessibility_mode_(AccessibilityModeOff) {
+      accessibility_mode_(0) {
 #if defined(OS_WIN)
   // On Windows 8, always enable accessibility for editable text controls
   // so we can show the virtual keyboard when one is enabled.
   if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
       !CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableRendererAccessibility)) {
-    accessibility_mode_ = AccessibilityModeEditableTextOnly;
+    accessibility_mode_ =
+        AccessibilityModeFlagRenderer & AccessibilityModeFlagEditableTextOnly;
   }
 #endif  // defined(OS_WIN)
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kForceRendererAccessibility)) {
-    accessibility_mode_ = AccessibilityModeComplete;
+    accessibility_mode_ =
+        AccessibilityModeFlagRenderer & AccessibilityModeFlagPlatform;
   }
 
 #if defined(OS_WIN)
   // On Windows, UpdateHistograms calls some system functions with unknown
   // runtime, so call it on the file thread to ensure there's no jank.
   // Everything in that method must be safe to call on another thread.
   BrowserThread::ID update_histogram_thread = BrowserThread::FILE;
 #else
   // On all other platforms, UpdateHistograms should be called on the main
   // thread.
@@ skipping 10 matching lines @@
 }
 
 BrowserAccessibilityStateImpl::~BrowserAccessibilityStateImpl() {
 }
 
 void BrowserAccessibilityStateImpl::OnScreenReaderDetected() {
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableRendererAccessibility)) {
     return;
   }
-  SetAccessibilityMode(AccessibilityModeComplete);
+  SetAccessibilityMode(AccessibilityModeFlagRenderer |
+                       AccessibilityModeFlagPlatform);
 }
 
 void BrowserAccessibilityStateImpl::EnableAccessibility() {
   // We may want to do something different with this later.
-  SetAccessibilityMode(AccessibilityModeComplete);
+  SetAccessibilityMode(AccessibilityModeFlagRenderer |
+                       AccessibilityModeFlagPlatform);
 }
 
 void BrowserAccessibilityStateImpl::DisableAccessibility() {
-  SetAccessibilityMode(AccessibilityModeOff);
+  SetAccessibilityMode(0);

[David Tseng, 2014/01/23 18:44:19]

Add a name for 0 as well.

[aboxhall, 2014/01/27 18:03:15]

Done.

 }
 
 bool BrowserAccessibilityStateImpl::IsAccessibleBrowser() {
-  return (accessibility_mode_ == AccessibilityModeComplete);
+  return ((accessibility_mode_ & AccessibilityModeFlagRenderer) &&
+           (accessibility_mode_ & AccessibilityModeFlagPlatform));
 }
 
 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 ((accessibility_mode_ & AccessibilityModeFlagRenderer) == on)

[David Tseng, 2014/01/23 18:44:19]

This looks wrong; don't you want:
((accessibility_mode_ & AccessibilityModeFlagRenderer) ==
AccessibilityModeFlagRenderer)

[aboxhall, 2014/01/27 18:03:15]

I don't think so. I want to check not whether it's on, but whether it's the same
as the 'on' argument, so this is almost right.

However, @jyasskin points out that this is going to cast |on| to an int (which
will be 1) and then compare it, so it's still technically wrong (even though it
does happen to work since, as you pointed out, AccessibilityModeFlagRenderer ==
1); I have now cast it to a bool, so it should be right.

+    return;
+
+  if (on)
+    accessibility_mode_ |= AccessibilityModeFlagRenderer;
+  else
+    accessibility_mode_ &= (~AccessibilityModeFlagRenderer);
+  // 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(accessibility_mode_);
+  }
+}
+
 }  // namespace content