Support additional webkit accessibility notifications and states.

chrome/browser/browser_accessibility_win.cc

 // Copyright (c) 2010 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 "chrome/browser/browser_accessibility_win.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_accessibility_manager_win.h"
@@ skipping 1074 matching lines @@
   return UTF8ToUTF16(EscapeNonASCII(UTF16ToUTF8(str)));
 }
 
 void BrowserAccessibility::InitRoleAndState(LONG web_role,
                                             LONG web_state) {
   state_ = 0;
   ia2_state_ = IA2_STATE_OPAQUE;
 
   if ((web_state >> WebAccessibility::STATE_CHECKED) & 1)
     state_ |= STATE_SYSTEM_CHECKED;
+  if ((web_state >> WebAccessibility::STATE_COLLAPSED) & 1)
+    state_ |= STATE_SYSTEM_COLLAPSED;
+  if ((web_state >> WebAccessibility::STATE_EXPANDED) & 1)
+    state_ |= STATE_SYSTEM_EXPANDED;
   if ((web_state >> WebAccessibility::STATE_FOCUSABLE) & 1)
     state_ |= STATE_SYSTEM_FOCUSABLE;
+  if ((web_state >> WebAccessibility::STATE_HASPOPUP) & 1)
+    state_ |= STATE_SYSTEM_HASPOPUP;
   if ((web_state >> WebAccessibility::STATE_HOTTRACKED) & 1)
     state_ |= STATE_SYSTEM_HOTTRACKED;
   if ((web_state >> WebAccessibility::STATE_INDETERMINATE) & 1)
     state_ |= STATE_SYSTEM_INDETERMINATE;
+  if ((web_state >> WebAccessibility::STATE_INVISIBLE) & 1)
+    state_ |= STATE_SYSTEM_INVISIBLE;
   if ((web_state >> WebAccessibility::STATE_LINKED) & 1)
     state_ |= STATE_SYSTEM_LINKED;
   if ((web_state >> WebAccessibility::STATE_MULTISELECTABLE) & 1)
     state_ |= STATE_SYSTEM_MULTISELECTABLE;
+  // TODO(ctguil): Support STATE_SYSTEM_EXTSELECTABLE/accSelect.
   if ((web_state >> WebAccessibility::STATE_OFFSCREEN) & 1)
     state_ |= STATE_SYSTEM_OFFSCREEN;
   if ((web_state >> WebAccessibility::STATE_PRESSED) & 1)
     state_ |= STATE_SYSTEM_PRESSED;
   if ((web_state >> WebAccessibility::STATE_PROTECTED) & 1)
     state_ |= STATE_SYSTEM_PROTECTED;
+  if ((web_state >> WebAccessibility::STATE_SELECTABLE) & 1)
+    state_ |= STATE_SYSTEM_SELECTABLE;
+  if ((web_state >> WebAccessibility::STATE_SELECTED) & 1)
+    state_ |= STATE_SYSTEM_SELECTED;
   if ((web_state >> WebAccessibility::STATE_READONLY) & 1)
     state_ |= STATE_SYSTEM_READONLY;
   if ((web_state >> WebAccessibility::STATE_TRAVERSED) & 1)
     state_ |= STATE_SYSTEM_TRAVERSED;
   if ((web_state >> WebAccessibility::STATE_BUSY) & 1)
     state_ |= STATE_SYSTEM_BUSY;
   if ((web_state >> WebAccessibility::STATE_UNAVAILABLE) & 1)
     state_ |= STATE_SYSTEM_UNAVAILABLE;
 
   role_ = 0;
@@ skipping 243 matching lines @@
   }
 
   // The role should always be set.
   DCHECK(!role_name_.empty() || role_);
 
   // If we didn't explicitly set the IAccessible2 role, make it the same
   // as the MSAA role.
   if (!ia2_role_)
     ia2_role_ = role_;
 }