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

webkit/glue/webaccessibilitymanager_impl.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 "config.h"
 
 #include "AXObjectCache.h"
 #include "Document.h"
 #include "Frame.h"
 #include "RefPtr.h"
@@ skipping 17 matching lines @@
 };
 
 /*static*/
 WebAccessibilityManager* WebAccessibilityManager::Create() {
   return new WebAccessibilityManagerImpl();
 }
 
 // class WebAccessibilityManagerImpl
 WebAccessibilityManagerImpl::WebAccessibilityManagerImpl()
     : root_(new GlueAccessibilityObjectRoot),
-      acc_obj_id_(0) {
+      acc_obj_id_(1000) {
 }
 
 WebAccessibilityManagerImpl::~WebAccessibilityManagerImpl() {
   int_to_glue_acc_obj_map_.clear();
   acc_obj_to_int_map_.clear();
 }
 
 bool WebAccessibilityManagerImpl::GetAccObjInfo(WebView* view,
   const WebAccessibility::InParams& in_params,
   WebAccessibility::OutParams* out_params) {
   if (!root_->acc_obj_root_ && !InitAccObjRoot(view)) {
     // Failure in retrieving or initializing the root.
     return false;
   }
 
   // Function input parameters.
   int object_id = in_params.object_id;
   int child_id = in_params.child_id;
 
-  if (!in_params.direct_descendant) {
+  // Since ids assigned by Chrome starts at 1000, whereas platform-specific ids
+  // used to reference a child will be in a wholly different range, we know
+  // that any id that high should be treated as a non-direct descendant.
+  if (in_params.child_id >= 1000) {
     // Object is not a direct child, re-map the input parameters accordingly.
     // The object to be retrieved is referred to by the |in_params.child_id|, as
     // a result of e.g. a focus event. The local |child_id| is set to 0, to
     // indicate that any function call should refer to the object itself.
     object_id = in_params.child_id;
     child_id = 0;
   }
 
   // Find GlueAccessibilityObject requested by |object_id|.
   IntToGlueAccObjMap::iterator it =
@@ skipping 171 matching lines @@
   if (it->second) {
     // Erase element from reverse hashmap.
     AccObjToIntMap::iterator it2 =
         acc_obj_to_int_map_.find(it->second->accessibilityObject());
 
     if (it2 != acc_obj_to_int_map_.end())
       acc_obj_to_int_map_.erase(it2);
   }
   int_to_glue_acc_obj_map_.erase(it);
 
-  if (acc_obj_id == 0) {
+  if (acc_obj_id == 1000) {
     // Invalidate root.
     root_->acc_obj_root_ = 0;
   }
   return true;
 }
 
 int WebAccessibilityManagerImpl::FocusAccObj(
     WebCore::AccessibilityObject* acc_obj) {
   if (!acc_obj) {
     // Return with failure.
     return -1;
   }
 
   AccObjToIntMap::iterator it = acc_obj_to_int_map_.find(acc_obj);
 
   if (it != acc_obj_to_int_map_.end())
     return it->second;
 
   // Insert new accessibility object in hashmaps and return its newly
   // assigned accessibility object id.
   int_to_glue_acc_obj_map_[acc_obj_id_] =
       GlueAccessibilityObject::CreateInstance(acc_obj);
   acc_obj_to_int_map_[acc_obj] = acc_obj_id_;
 
   return acc_obj_id_++;
 }
 
 }  // namespace webkit_glue