Support additional webkit accessibility notifications and states.

webkit/glue/webaccessibility.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 "webkit/glue/webaccessibility.h"
 
 #include "base/string_util.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityCache.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityObject.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityRole.h"
@@ skipping 209 matching lines @@
     default:
       return WebAccessibility::ROLE_UNKNOWN;
   }
 }
 
 uint32 ConvertState(const WebAccessibilityObject& o) {
   uint32 state = 0;
   if (o.isChecked())
     state |= (1 << WebAccessibility::STATE_CHECKED);
 
+  if (o.isCollapsed())
+    state |= (1 << WebAccessibility::STATE_COLLAPSED);
+
   if (o.canSetFocusAttribute())
     state |= (1 << WebAccessibility::STATE_FOCUSABLE);
 
   if (o.isFocused())
     state |= (1 << WebAccessibility::STATE_FOCUSED);
 
+  if (o.roleValue() == WebKit::WebAccessibilityRolePopUpButton) {
+    state |= (1 << WebAccessibility::STATE_HASPOPUP);
+
+    if (!o.isCollapsed())
+      state |= (1 << WebAccessibility::STATE_EXPANDED);
+  }
+
   if (o.isHovered())
     state |= (1 << WebAccessibility::STATE_HOTTRACKED);
 
   if (o.isIndeterminate())
     state |= (1 << WebAccessibility::STATE_INDETERMINATE);
 
-  if (o.isAnchor())
+  if (!o.isVisible())
+    state |= (1 << WebAccessibility::STATE_INVISIBLE);
+
+  if (o.isLinked())
     state |= (1 << WebAccessibility::STATE_LINKED);
 
   if (o.isMultiSelectable())
     state |= (1 << WebAccessibility::STATE_MULTISELECTABLE);
 
   if (o.isOffScreen())
     state |= (1 << WebAccessibility::STATE_OFFSCREEN);
 
   if (o.isPressed())
     state |= (1 << WebAccessibility::STATE_PRESSED);
 
   if (o.isPasswordField())
     state |= (1 << WebAccessibility::STATE_PROTECTED);
 
   if (o.isReadOnly())
     state |= (1 << WebAccessibility::STATE_READONLY);
 
+  if (o.canSetSelectedAttribute())
+    state |= (1 << WebAccessibility::STATE_SELECTABLE);
+
+  if (o.isSelected())
+    state |= (1 << WebAccessibility::STATE_SELECTED);
+
   if (o.isVisited())
     state |= (1 << WebAccessibility::STATE_TRAVERSED);
 
   if (!o.isEnabled())
     state |= (1 << WebAccessibility::STATE_UNAVAILABLE);
 
   return state;
 }
 
 WebAccessibility::WebAccessibility()
@@ skipping 73 matching lines @@
     // The child may be invalid due to issues in webkit accessibility code.
     // Don't add children are invalid thus preventing a crash.
     // https://bugs.webkit.org/show_bug.cgi?id=44149
     // TODO(ctguil): We may want to remove this check as webkit stabilizes.
     if (child.isValid())
       children.push_back(WebAccessibility(child, cache));
   }
 }
 
 }  // namespace webkit_glue