Switch AccessibilityMode to be a bitmap

content/common/view_message_enums.h

 // 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.
 
 #ifndef CONTENT_COMMON_VIEW_MESSAGES_ENUMS_H_
 #define CONTENT_COMMON_VIEW_MESSAGES_ENUMS_H_
 
 #include "ipc/ipc_message_macros.h"
 
 // Values that may be OR'd together to form the 'flags' parameter of a
@@ skipping 35 matching lines @@
     RESTORE,
 
     // Like RESTORE, except that the navigation contains POST data.
     RESTORE_WITH_POST,
 
     // Navigation type not categorized by the other types.
     NORMAL
   };
 };
 
-enum AccessibilityMode {
-  // WebKit accessibility is off and no accessibility information is
-  // sent from the renderer to the browser process.
-  AccessibilityModeOff,
+enum AccessibilityModeFlag {
+  // Blink accessibility is on and accessibility information is sent from the
+  // renderer to the browser process. Note that none of the other flags do
+  // anything if this flag is off.
+  AccessibilityModeFlagRenderer = 1 << 0,
 
-  // WebKit accessibility is on, but only limited information about
+  // Accessibility updates are processed to create platform trees and events are
+  // passed to platform APIs in the browser.
+  AccessibilityModeFlagPlatform = 1 << 1,
+
+  // Blink accessibility is on, but only limited information about
   // editable text nodes is sent to the browser process. Useful for
   // implementing limited UIA on tablets.
-  AccessibilityModeEditableTextOnly,
+  AccessibilityModeFlagEditableTextOnly = 1 << 2,
+};
 
-  // WebKit accessibility is on, and the full accessibility tree is synced
-  // to the browser process. Useful for screen readers and magnifiers.
-  AccessibilityModeComplete,
+enum AccessibilityMode {
+  // All accessibility is off.
+  AccessibilityModeOff = 0,
+
+  // Renderer accessibility is on, and platform APIs are called. Note that this
+  // is different to AccessibilityModeAll, which is defined to be all bits on.
+  AccessibilityModeComplete =
+      AccessibilityModeFlagRenderer | AccessibilityModeFlagPlatform,
+
+  // Renderer accessibility is on, platform APIs are called, but only limited
+  // information is available (see AccessibilityModeFlagEditableTextOnly).
+  AccessibilityModeEditableTextOnly = AccessibilityModeFlagEditableTextOnly,

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

I think you're expecting to also have the renderer bit set.

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

I still can't make up my mind on this one. 

+
+  // All bits on.
+  AccessibilityModeAll = AccessibilityModeFlagRenderer |
+                         AccessibilityModeFlagPlatform |
+                         AccessibilityModeFlagEditableTextOnly
 };
 
 #endif  // CONTENT_COMMON_VIEW_MESSAGES_ENUMS_H_