Fixes an issue where the MSAA information was not reported back correctly to ...

chrome/browser/browser_accessibility.cc

 // Copyright (c) 2006-2008 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.h"
 
 #include "base/logging.h"
 #include "chrome/browser/browser_accessibility_manager.h"
 
 using webkit_glue::WebAccessibility;
 
 HRESULT BrowserAccessibility::Initialize(int iaccessible_id, int routing_id,
                                          int process_id, HWND parent_hwnd) {
-  if (!parent_hwnd || iaccessible_id < 0)
+  // Check input parameters. Root id is 1000, to avoid conflicts with the ids
+  // used by MSAA.
+  if (!parent_hwnd || iaccessible_id < 1000)
     return E_INVALIDARG;
 
   iaccessible_id_ = iaccessible_id;
   routing_id_ = routing_id;
   process_id_ = process_id;
   parent_hwnd_ = parent_hwnd;
 
   // Mark instance as active.
   instance_active_ = true;
-
-  // Treat child ids intitially as referring to direct children of the object.
-  direct_descendant_ = true;
-
   return S_OK;
 }
 
 HRESULT BrowserAccessibility::accDoDefaultAction(VARIANT var_id) {
   if (!instance_active()) {
     // Instance no longer active, fail gracefully.
     // TODO(klink): Once we have MSAA events, change these fails to having
     // BrowserAccessibilityManager firing the right event.
     return E_FAIL;
   }
@@ skipping 147 matching lines @@
                                                 IDispatch** disp_child) {
   if (!instance_active()) {
     // Instance no longer active, fail gracefully.
     return E_FAIL;
   }
 
   if (var_child.vt != VT_I4 || !disp_child)
     return E_INVALIDARG;
 
   // If var_child is the parent, remain with the same IDispatch.
-  if (var_child.lVal == CHILDID_SELF && iaccessible_id_ != 0)
+  if (var_child.lVal == CHILDID_SELF && iaccessible_id_ != 1000)
     return S_OK;
 
   if (!RequestAccessibilityInfo(WebAccessibility::FUNCTION_GETCHILD, var_child,
                                 NULL, NULL)) {
     return E_FAIL;
   }
 
   if (!response().return_code) {
     // When at a leaf, children are handled by the parent object.
     *disp_child = NULL;
@@ skipping 198 matching lines @@
 STDMETHODIMP BrowserAccessibility::get_accParent(IDispatch** disp_parent) {
   if (!instance_active()) {
     // Instance no longer active, fail gracefully.
     return E_FAIL;
   }
 
   if (!disp_parent || !parent_hwnd_)
     return E_INVALIDARG;
 
   // Root node's parent is the containing HWND's IAccessible.
-  if (iaccessible_id_ == 0) {
+  if (iaccessible_id_ == 1000) {
     // For an object that has no parent (e.g. root), point the accessible parent
     // to the default implementation.
     HRESULT hr =
         ::CreateStdAccessibleObject(parent_hwnd_, OBJID_WINDOW,
                                     IID_IAccessible,
                                     reinterpret_cast<void**>(disp_parent));
 
     if (!SUCCEEDED(hr)) {
       *disp_parent = NULL;
       return S_FALSE;
@@ skipping 116 matching lines @@
 
 bool BrowserAccessibility::RequestAccessibilityInfo(int iaccessible_func_id,
                                                     VARIANT var_id, LONG input1,
                                                     LONG input2) {
   // Create and populate IPC message structure, for retrieval of accessibility
   // information from the renderer.
   WebAccessibility::InParams in_params;
   in_params.object_id = iaccessible_id_;
   in_params.function_id = iaccessible_func_id;
   in_params.child_id = var_id.lVal;
-  in_params.direct_descendant = direct_descendant();
   in_params.input_long1 = input1;
   in_params.input_long2 = input2;
 
-  if (!direct_descendant())
-    set_direct_descendant(true);
-
   return BrowserAccessibilityManager::GetInstance()->
       RequestAccessibilityInfo(&in_params, routing_id_, process_id_);
 }
 
 const WebAccessibility::OutParams& BrowserAccessibility::response() {
   return BrowserAccessibilityManager::GetInstance()->response();
 }
 
 long BrowserAccessibility::MSAARole(long browser_accessibility_role) {
   switch (browser_accessibility_role) {
@@ skipping 75 matching lines @@
       state |= STATE_SYSTEM_FOCUSED;
 
   if ((browser_accessibility_state >> WebAccessibility::STATE_TRAVERSED) & 1)
       state |= STATE_SYSTEM_TRAVERSED;
 
   if ((browser_accessibility_state >> WebAccessibility::STATE_FOCUSABLE) & 1)
       state |= STATE_SYSTEM_FOCUSABLE;
 
   return state;
 }