Switch AccessibilityMode to be a bitmap

content/renderer/render_view_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/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 1071 matching lines @@
     int32 routing_id,
     int32 main_frame_routing_id,
     int32 surface_id,
     int64 session_storage_namespace_id,
     const base::string16& frame_name,
     bool is_renderer_created,
     bool swapped_out,
     bool hidden,
     int32 next_page_id,
     const blink::WebScreenInfo& screen_info,
-    AccessibilityMode accessibility_mode,
+    unsigned int accessibility_mode,
     bool allow_partial_swap) {
   DCHECK(routing_id != MSG_ROUTING_NONE);
   RenderViewImplParams params(
       opener_id,
       renderer_prefs,
       webkit_prefs,
       routing_id,
       main_frame_routing_id,
       surface_id,
       session_storage_namespace_id,
@@ skipping 4177 matching lines @@
 
 void RenderViewImpl::OnSetBackground(const SkBitmap& background) {
   if (webview())
     webview()->setIsTransparent(!background.empty());
   if (compositor_)
     compositor_->setHasTransparentBackground(!background.empty());
 
   SetBackground(background);
 }
 
-void RenderViewImpl::OnSetAccessibilityMode(AccessibilityMode new_mode) {
+void RenderViewImpl::OnSetAccessibilityMode(unsigned int new_mode) {
   if (accessibility_mode_ == new_mode)
     return;
   accessibility_mode_ = new_mode;
   if (renderer_accessibility_) {
     delete renderer_accessibility_;
     renderer_accessibility_ = NULL;
   }
-  if (accessibility_mode_ == AccessibilityModeComplete)
+  if (!(accessibility_mode_ & AccessibilityModeFlagRenderer))
+    return;

[David Tseng, 2014/02/04 20:25:51]

What about editable text only? This leads me to believe that the renderer bit is
implied in all modes.

[aboxhall, 2014/02/05 16:02:47]

Ok, I think it'll be simpler if I go back to what I originally had. I'll do that
and then we can see how that looks.

+
+  if (!(accessibility_mode_ & AccessibilityModeFlagEditableTextOnly))
     renderer_accessibility_ = new RendererAccessibilityComplete(this);
 #if !defined(OS_ANDROID)
-  else if (accessibility_mode_ == AccessibilityModeEditableTextOnly)
+  else if (accessibility_mode_ & AccessibilityModeFlagEditableTextOnly)
     renderer_accessibility_ = new RendererAccessibilityFocusOnly(this);
 #endif
 }
 
 void RenderViewImpl::OnSetActive(bool active) {
   if (webview())
     webview()->setIsActive(active);
 
 #if defined(ENABLE_PLUGINS) && defined(OS_MACOSX)
   std::set<WebPluginDelegateProxy*>::iterator plugin_it;
@@ skipping 769 matching lines @@
   if (main_frame && main_frame->opener())
     main_frame->setOpener(NULL);
 }
 
 #if defined(OS_ANDROID)
 bool RenderViewImpl::didTapMultipleTargets(
     const blink::WebGestureEvent& event,
     const WebVector<WebRect>& target_rects) {
   // Never show a disambiguation popup when accessibility is enabled,
   // as this interferes with "touch exploration".
-  if (accessibility_mode_ == AccessibilityModeComplete)
+  bool matchesAccessibilityModeComplete =
+      accessibility_mode_ & AccessibilityModeComplete;
+  bool hasEditableTextOnlyFlag =
+      accessibility_mode_ & AccessibilityModeFlagEditableTextOnly;
+  if (matchesAccessibilityModeComplete && !hasEditableTextOnlyFlag)
     return false;
 
   gfx::Rect finger_rect(
       event.x - event.data.tap.width / 2, event.y - event.data.tap.height / 2,
       event.data.tap.width, event.data.tap.height);
   gfx::Rect zoom_rect;
   float new_total_scale =
       DisambiguationPopupHelper::ComputeZoomAreaAndScaleFactor(
           finger_rect, target_rects, GetSize(),
           gfx::Rect(webview()->mainFrame()->visibleContentRect()).size(),
@@ skipping 139 matching lines @@
   for (size_t i = 0; i < icon_urls.size(); i++) {
     WebURL url = icon_urls[i].iconURL();
     if (!url.isEmpty())
       urls.push_back(FaviconURL(url,
                                 ToFaviconType(icon_urls[i].iconType())));
   }
   SendUpdateFaviconURL(urls);
 }
 
 }  // namespace content