Switch AccessibilityMode to be a bitmap

content/browser/accessibility/accessibility_ui.cc

 // Copyright (c) 2013 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/accessibility_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_writer.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 31 matching lines @@
 namespace content {
 
 namespace {
 
 base::DictionaryValue* BuildTargetDescriptor(
     const GURL& url,
     const std::string& name,
     const GURL& favicon_url,
     int process_id,
     int route_id,
-    AccessibilityMode accessibility_mode,
+    unsigned int accessibility_mode,
     base::ProcessHandle handle = base::kNullProcessHandle) {
   base::DictionaryValue* target_data = new base::DictionaryValue();
   target_data->SetInteger(kProcessIdField, process_id);
   target_data->SetInteger(kRouteIdField, route_id);
   target_data->SetString(kUrlField, url.spec());
   target_data->SetString(kNameField, net::EscapeForHTML(name));
   target_data->SetInteger(kPidField, base::GetProcId(handle));
   target_data->SetString(kFaviconUrlField, favicon_url.spec());
   target_data->SetInteger(kAccessibilityModeField,
                           accessibility_mode);
   return target_data;
 }
 
 base::DictionaryValue* BuildTargetDescriptor(RenderViewHost* rvh) {
   WebContents* web_contents = WebContents::FromRenderViewHost(rvh);
   std::string title;
   RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(rvh);
-  AccessibilityMode accessibility_mode = rwhi->accessibility_mode();
+  unsigned int accessibility_mode = rwhi->accessibility_mode();
 
   GURL url;
   GURL favicon_url;
   if (web_contents) {
     // TODO(nasko): Fix the following code to use a consistent set of data
     // across the URL, title, and favicon.
     url = web_contents->GetURL();
     title = base::UTF16ToUTF8(web_contents->GetTitle());
     NavigationController& controller = web_contents->GetController();
     NavigationEntry* entry = controller.GetVisibleEntry();
@@ skipping 21 matching lines @@
       continue;
     if (!widget->IsRenderView())
         continue;
 
     RenderViewHost* rvh = RenderViewHost::From(widget);
     rvh_list->Append(BuildTargetDescriptor(rvh));
   }
 
   scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue());
   data->Set("list", rvh_list.release());
-  scoped_ptr<base::FundamentalValue> a11y_mode(new base::FundamentalValue(
+  scoped_ptr<base::FundamentalValue> a11y_mode(base::Value::CreateIntegerValue(
       BrowserAccessibilityStateImpl::GetInstance()->accessibility_mode()));
   data->Set("global_a11y_mode", a11y_mode.release());
 
   std::string json_string;
   base::JSONWriter::Write(data.get(), &json_string);
 
   callback.Run(base::RefCountedString::TakeString(&json_string));
 }
 
 bool HandleRequestCallback(
@@ skipping 54 matching lines @@
   CHECK(base::StringToInt(process_id_str,
                           &process_id));
   CHECK(base::StringToInt(route_id_str, &route_id));
 
   RenderViewHost* rvh = RenderViewHost::FromID(process_id, route_id);
   if (!rvh)
     return;
   RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(rvh);
   if (!rwhi)
     return;
-  AccessibilityMode mode = rwhi->accessibility_mode();
-  if (mode == AccessibilityModeOff)
-    rwhi->SetAccessibilityMode(AccessibilityModeComplete);
+  unsigned int mode = rwhi->accessibility_mode();
+  if (mode & AccessibilityModeFlagRenderer)
+    rwhi->SetRendererAccessibilityMode(true);
   else
-    rwhi->SetAccessibilityMode(AccessibilityModeOff);
+    rwhi->SetRendererAccessibilityMode(false);
 }
 
 void AccessibilityUI::ToggleGlobalAccessibility(const base::ListValue* args) {
   BrowserAccessibilityStateImpl* state =
       BrowserAccessibilityStateImpl::GetInstance();
-  AccessibilityMode mode = state->accessibility_mode();
-  AccessibilityMode new_mode = (mode == AccessibilityModeOff
-                                ? AccessibilityModeComplete
-                                : AccessibilityModeOff);
+  unsigned int mode = state->accessibility_mode();
+  unsigned int new_mode = (mode & AccessibilityModeFlagRenderer

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

This whole block is equivalent to xor.

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

Facepalm...

Fixed.

+                               ? mode & (~AccessibilityModeFlagRenderer)
+                               : mode | AccessibilityModeFlagRenderer);
   state->SetAccessibilityMode(new_mode);
 }
 
 void AccessibilityUI::RequestAccessibilityTree(const base::ListValue* args) {
   std::string process_id_str;
   std::string route_id_str;
   int process_id;
   int route_id;
   CHECK(args->GetSize() == 2);
   CHECK(args->GetString(0, &process_id_str));
@@ skipping 38 matching lines @@
   formatter->SetFilters(filters);
   formatter->FormatAccessibilityTree(&accessibility_contents_utf16);
 
   result->Set("tree",
               new base::StringValue(
                   base::UTF16ToUTF8(accessibility_contents_utf16)));
   web_ui()->CallJavascriptFunction("accessibility.showTree", *(result.get()));
 }
 
 }  // namespace content