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 822 matching lines @@
       notification_provider_(NULL),
       geolocation_dispatcher_(NULL),
       input_tag_speech_dispatcher_(NULL),
       speech_recognition_dispatcher_(NULL),
       media_stream_dispatcher_(NULL),
       browser_plugin_manager_(NULL),
       media_stream_client_(NULL),
       web_user_media_client_(NULL),
       midi_dispatcher_(NULL),
       devtools_agent_(NULL),
-      accessibility_mode_(AccessibilityModeOff),
+      accessibility_mode_(0),

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

Define/use the enum here.

[aboxhall, 2014/01/28 17:48:26]

Done.

       renderer_accessibility_(NULL),
       mouse_lock_dispatcher_(NULL),
 #if defined(OS_ANDROID)
       body_background_color_(SK_ColorWHITE),
       expected_content_intent_id_(0),
       media_player_manager_(NULL),
 #endif
 #if defined(OS_WIN)
       focused_plugin_id_(-1),
 #endif
@@ skipping 232 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 4173 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))

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

You might want to check this. What happens to !0b0010 for example? (in this
case, it works because AccessibilityModeRenderer == 1).

[aboxhall, 2014/01/28 17:48:26]

In C++, "the value zero (for integral, floating-point, and unscoped enumeration)
and the null pointer and the null pointer-to-member values become false. All
other values become true."
http://en.cppreference.com/w/cpp/language/implicit_cast#Boolean_conversions
https://github.com/cplusplus/draft/blob/19ae5173cfd1614766da27504a9beeeffd3ee...

! forces an implicit conversion to bool for its operand:
https://github.com/cplusplus/draft/blob/19ae5173cfd1614766da27504a9beeeffd3ee...

(github links are for working draft standard, since that's the only freely
available one. Hopefully this behaviour hasn't changed recently.)

+    return;
+
+  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 792 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)
+  if (accessibility_mode_ & AccessibilityModeFlagRenderer &&

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

Please define and use accessibility complete in the accessibility mode enum.

[aboxhall, 2014/01/28 17:48:26]

Done. Note that we explicitly don't want to check for ==
AccessibilityModeComplete since that will break when we add the extra flag for
AccessibilityModeFlagExtension in a future CL and can potentially have
{AccessibilityModeFlagRenderer & AccessibilityModeFlagPlatform &
AccessibilityModeFlagExtension} here.

+      accessibility_mode_ & AccessibilityModeFlagPlatform &&
+      !(accessibility_mode_ & AccessibilityModeFlagEditableTextOnly))
     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