AX checked state changes

ui/accessibility/platform/ax_platform_node_win.cc

 // Copyright 2015 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 <atlbase.h>
 #include <atlcom.h>
 #include <limits.h>
 #include <oleacc.h>
 #include <stdint.h>
 
@@ skipping 1026 matching lines @@
     case ui::AX_ROLE_WINDOW:
       return ROLE_SYSTEM_WINDOW;
     case ui::AX_ROLE_CLIENT:
     default:
       // This is the default role for MSAA.
       return ROLE_SYSTEM_CLIENT;
   }
 }
 
 int AXPlatformNodeWin::MSAAState() {
-  uint32_t state = GetData().state;
+  const AXNodeData& data = GetData();
+  uint32_t state = data.state;
 
   int msaa_state = 0;
-  if (state & (1 << ui::AX_STATE_CHECKED))
-    msaa_state |= STATE_SYSTEM_CHECKED;
   if (state & (1 << ui::AX_STATE_COLLAPSED))
     msaa_state |= STATE_SYSTEM_COLLAPSED;
   if (state & (1 << ui::AX_STATE_DEFAULT))
     msaa_state |= STATE_SYSTEM_DEFAULT;
   if (state & (1 << ui::AX_STATE_EXPANDED))
     msaa_state |= STATE_SYSTEM_EXPANDED;
   if (state & (1 << ui::AX_STATE_FOCUSABLE))
     msaa_state |= STATE_SYSTEM_FOCUSABLE;
   if (state & (1 << ui::AX_STATE_HASPOPUP))
     msaa_state |= STATE_SYSTEM_HASPOPUP;
@@ skipping 11 matching lines @@
     msaa_state |= STATE_SYSTEM_PROTECTED;
   if (state & (1 << ui::AX_STATE_READ_ONLY))
     msaa_state |= STATE_SYSTEM_READONLY;
   if (state & (1 << ui::AX_STATE_SELECTABLE))
     msaa_state |= STATE_SYSTEM_SELECTABLE;
   if (state & (1 << ui::AX_STATE_SELECTED))
     msaa_state |= STATE_SYSTEM_SELECTED;
   if (state & (1 << ui::AX_STATE_DISABLED))
     msaa_state |= STATE_SYSTEM_UNAVAILABLE;
 
+  // Checked state
+  const int checked = GetIntAttribute(ui::AX_ATTR_INVALID_STATE);
+  switch (checked) {
+    case ui::AX_CHECKED_STATE_TRUE:
+      msaa_state |= STATE_SYSTEM_CHECKED;
+      break;
+    case ui::AX_CHECKED_STATE_MIXED:
+      msaa_state |=  (STATE_SYSTEM_MIXED | STATE_SYSTEM_CHECKED);
+      break;
+    default:
+      break;
+  }
+
   gfx::NativeViewAccessible focus = delegate_->GetFocus();
   if (focus == GetNativeViewAccessible())
     msaa_state |= STATE_SYSTEM_FOCUSED;
 
   // On Windows, the "focus" bit should be set on certain containers, like
   // menu bars, when visible.
   //
   // TODO(dmazzoni): this should probably check if focus is actually inside
   // the menu bar, but we don't currently track focus inside menu pop-ups,
   // and Chrome only has one menu visible at a time so this works for now.
-  if (GetData().role == ui::AX_ROLE_MENU_BAR &&
+  if (data.role == ui::AX_ROLE_MENU_BAR &&
       !(state & (1 << ui::AX_STATE_INVISIBLE))) {
     msaa_state |= STATE_SYSTEM_FOCUSED;
   }
 
   return msaa_state;
 }
 
 int AXPlatformNodeWin::MSAAEvent(ui::AXEvent event) {
   switch (event) {
     case ui::AX_EVENT_ALERT:
@@ skipping 87 matching lines @@
     ui::TextBoundaryDirection direction) {
   HandleSpecialTextOffset(&start_offset);
   ui::TextBoundaryType boundary = IA2TextBoundaryToTextBoundary(ia2_boundary);
   std::vector<int32_t> line_breaks;
   return static_cast<LONG>(ui::FindAccessibleTextBoundary(
       text, line_breaks, boundary, start_offset, direction,
       AX_TEXT_AFFINITY_DOWNSTREAM));
 }
 
 }  // namespace ui