Keep a map of all views that have sent notifications. This ensures that Acce...

views/accessibility/view_accessibility.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 "views/accessibility/view_accessibility.h"
 
 #include "views/accessibility/view_accessibility_wrapper.h"
 #include "views/widget/widget.h"
 #include "views/widget/widget_win.h"
 
@@ skipping 272 matching lines @@
 
   if (!view_) {
     return E_FAIL;
   }
 
   views::View* child_view = NULL;
 
   // Check to see if child is out-of-bounds.
   if (IsValidChild((var_child.lVal - 1), view_)) {
     child_view = view_->GetChildViewAt(var_child.lVal - 1);
+
+    // Parents handle leaf IAccessible's.
+    if (child_view && child_view->GetChildViewCount() == 0)
+      return S_FALSE;
   } else {
-    // Child is located elsewhere in the hierarchy, get ID and adjust for MSAA.
-    child_view = view_->GetViewByID(static_cast<int>(var_child.lVal));
+    // Child is located elsewhere in this view's subtree.
+    // Positive child id's are 1-based indexes so you can iterate over all
+    // children, and negative values are direct references to objects.
+    // Note that we return full IAccessible's for leafs that have
+    // negative child id's.
+    if (var_child.lVal > 0) {
+      child_view = view_->GetViewByID(static_cast<int>(var_child.lVal));
+    } else {
+      // Retrieve it from our cache of views that have fired events.
+      views::WidgetWin* view_widget =
+          static_cast<views::WidgetWin*>(view_->GetWidget());
+      child_view = view_widget->GetAccessibilityViewEventAt(var_child.lVal);
+    }
   }
 
   if (!child_view) {
     // No child found.
     *disp_child = NULL;
     return E_FAIL;
   }
 
   // First, check to see if the child is a native view.
   if (child_view->GetClassName() == views::NativeViewHost::kViewClassName) {
@@ skipping 443 matching lines @@
   if (V_VT(&var_id) == VT_BSTR) {
     if (!lstrcmpi(var_id.bstrVal, kViewsUninitializeAccessibilityInstance)) {
       view_ = NULL;
       return S_OK;
     }
   }
   // Deprecated.
   return E_NOTIMPL;
 }
 
+int32 ViewAccessibility::MSAAEvent(AccessibilityTypes::Event event) {
+  switch (event) {
+    case AccessibilityTypes::EVENT_FOCUS:
+      return EVENT_OBJECT_FOCUS;
+    case AccessibilityTypes::EVENT_MENUSTART:
+      return EVENT_SYSTEM_MENUSTART;
+    case AccessibilityTypes::EVENT_MENUEND:
+      return EVENT_SYSTEM_MENUEND;
+    case AccessibilityTypes::EVENT_MENUPOPUPSTART:
+      return EVENT_SYSTEM_MENUPOPUPSTART;
+    case AccessibilityTypes::EVENT_MENUPOPUPEND:
+      return EVENT_SYSTEM_MENUPOPUPEND;
+    default:
+      // Not supported or invalid event.
+      NOTREACHED();
+      return -1;
+  }
+}
+
 int32 ViewAccessibility::MSAARole(AccessibilityTypes::Role role) {
   switch (role) {
     case AccessibilityTypes::ROLE_APPLICATION:
       return ROLE_SYSTEM_APPLICATION;
     case AccessibilityTypes::ROLE_BUTTONDROPDOWN:
       return ROLE_SYSTEM_BUTTONDROPDOWN;
     case AccessibilityTypes::ROLE_BUTTONMENU:
       return ROLE_SYSTEM_BUTTONMENU;
     case AccessibilityTypes::ROLE_CHECKBUTTON:
       return ROLE_SYSTEM_CHECKBUTTON;
@@ skipping 81 matching lines @@
     HWND native_view_window , IDispatch** disp_child) {
   if (IsWindow(native_view_window)) {
     LRESULT ret = SendMessage(native_view_window, WM_GETOBJECT, 0,
                               OBJID_CLIENT);
     return ObjectFromLresult(ret, IID_IDispatch, 0,
                              reinterpret_cast<void**>(disp_child));
   }
 
   return E_FAIL;
 }