Adds propagation and handling of render-side focus events, for the benefit of...

webkit/glue/webaccessibilitymanager_impl.cc

Index: webkit/glue/webaccessibilitymanager_impl.cc
===================================================================
--- webkit/glue/webaccessibilitymanager_impl.cc	(revision 16095)
+++ webkit/glue/webaccessibilitymanager_impl.cc	(working copy)
@@ -34,9 +34,15 @@
 
 // class WebAccessibilityManagerImpl
 WebAccessibilityManagerImpl::WebAccessibilityManagerImpl()
-    : root_(new GlueAccessibilityObjectRoot) {
+    : root_(new GlueAccessibilityObjectRoot),
+      acc_obj_id_(0) {
 }
 
+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) {
@@ -45,18 +51,28 @@
     return false;
   }
 
-  // Find GlueAccessibilityObject requested by [in_params.object_id].
-  IntToAccObjMap::iterator it =
-      int_to_acc_obj_map_.find(in_params.object_id);
-  if (it == int_to_acc_obj_map_.end() || !it->second) {
+  // Function input parameters.
+  int object_id = in_params.object_id;
+  int child_id = in_params.child_id;
+
+  if (!in_params.direct_descendant) {
+    // Object is not a direct child, re-map the input parameters accordingly.
+    // The object to be retrived is referred to by the |in_params.child_id|, as

[jcampan, 2009/05/19 21:50:04]

typo: retrived -> retrieved

+    // 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 =
+      int_to_glue_acc_obj_map_.find(object_id);
+  if (it == int_to_glue_acc_obj_map_.end() || !it->second) {
     // Map did not contain a valid instance of the data requested.
     return false;
   }
   RefPtr<GlueAccessibilityObject> active_acc_obj = it->second;
 
-  // Function input parameters.
-  int child_id = in_params.child_id;
-
   // Temp paramters for holding output information.
   RefPtr<GlueAccessibilityObject> out_acc_obj = NULL;
   WebCore::String out_string;
@@ -156,7 +172,8 @@
     out_params->output_string = StringToString16(out_string);
 
   if (out_acc_obj) {
-    AccObjToIntMap::iterator it = acc_obj_to_int_map_.find(out_acc_obj.get());
+    AccObjToIntMap::iterator it =
+        acc_obj_to_int_map_.find(out_acc_obj->accessibilityObject());
 
     if (it != acc_obj_to_int_map_.end()) {
       // Data already present in map, return previously assigned id.
@@ -164,8 +181,8 @@
       out_params->output_long1 = -1;
     } else {
       // Insert new GlueAccessibilityObject in hashmaps.
-      int_to_acc_obj_map_[acc_obj_id_] = out_acc_obj.get();
-      acc_obj_to_int_map_[out_acc_obj.get()] = acc_obj_id_;
+      int_to_glue_acc_obj_map_[acc_obj_id_] = out_acc_obj.get();
+      acc_obj_to_int_map_[out_acc_obj->accessibilityObject()] = acc_obj_id_;
       out_params->object_id = acc_obj_id_++;
       out_params->output_long1 = -1;
     }
@@ -175,9 +192,6 @@
 }
 
 bool WebAccessibilityManagerImpl::InitAccObjRoot(WebView* view) {
-  // Root id is always 0.
-  acc_obj_id_ = 0;
-
   // Enable accessibility and retrieve Document.
   WebCore::AXObjectCache::enableAccessibility();
   WebFrameImpl* main_frame_impl =
@@ -199,8 +213,9 @@
         axObjectCache()->getOrCreate(doc->renderer()));
   }
   // Insert root in hashmaps.
-  int_to_acc_obj_map_[acc_obj_id_] = root_->acc_obj_root_.get();
-  acc_obj_to_int_map_[root_->acc_obj_root_.get()] = acc_obj_id_++;
+  int_to_glue_acc_obj_map_[acc_obj_id_] = root_->acc_obj_root_.get();
+  acc_obj_to_int_map_[root_->acc_obj_root_->accessibilityObject()] =
+      acc_obj_id_++;
 
   return true;
 }
@@ -209,27 +224,28 @@
                                                  bool clear_all) {
   if (clear_all) {
     // Clear maps and invalidate root.
-    int_to_acc_obj_map_.clear();
+    int_to_glue_acc_obj_map_.clear();
     acc_obj_to_int_map_.clear();
     root_->acc_obj_root_ = 0;
     return true;
   }
 
-  IntToAccObjMap::iterator it = int_to_acc_obj_map_.find(acc_obj_id);
+  IntToGlueAccObjMap::iterator it = int_to_glue_acc_obj_map_.find(acc_obj_id);
 
-  if (it == int_to_acc_obj_map_.end()) {
+  if (it == int_to_glue_acc_obj_map_.end()) {
     // Element not found.
     return false;
   }
 
   if (it->second) {
     // Erase element from reverse hashmap.
-    AccObjToIntMap::iterator it2 = acc_obj_to_int_map_.find(it->second);
+    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_acc_obj_map_.erase(it);
+  int_to_glue_acc_obj_map_.erase(it);
 
   if (acc_obj_id == 0) {
     // Invalidate root.
@@ -238,4 +254,26 @@
   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;
+  } else {

[darin (slow to review), 2009/05/18 22:43:21]

nit: no need for else after return.  would be nice to reduce indentation of
remainder of function.

+    // 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