Implement automatic load of composed/embedded automation trees

chrome/browser/extensions/api/automation_internal/automation_util.cc

 // Copyright 2014 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/extensions/api/automation_internal/automation_util.h"
 
 #include <string>
 #include <utility>
 
 #include "base/values.h"
 #include "chrome/common/extensions/api/automation_internal.h"
 #include "extensions/browser/event_router.h"
 #include "ui/accessibility/ax_enums.h"
 #include "ui/accessibility/ax_node_data.h"
+#include "ui/accessibility/ax_tree_id_registry.h"
 
 namespace extensions {
 
 namespace {
 
 void PopulateNodeData(const ui::AXNodeData& node_data,
     linked_ptr< api::automation_internal::AXNodeData>& out_node_data) {
   out_node_data->id = node_data.id;
   out_node_data->role = ToString(node_data.role);
 
@@ skipping 104 matching lines @@
     const gfx::Vector2d& location_offset) {
   using api::automation_internal::AXEventParams;
   using api::automation_internal::AXTreeUpdate;
 
   std::vector<content::AXEventNotificationDetails>::const_iterator iter =
       details.begin();
   for (; iter != details.end(); ++iter) {
     const content::AXEventNotificationDetails& event = *iter;
 
     AXEventParams ax_event_params;
-    ax_event_params.process_id = event.process_id;
-    ax_event_params.routing_id = event.routing_id;
+    ax_event_params.tree_id =
+        ui::AXTreeIDRegistry::GetInstance()->GetOrCreateAXTreeID(
+            event.process_id, event.routing_id);
     ax_event_params.event_type = ToString(iter->event_type);
     ax_event_params.target_id = event.id;
 
     AXTreeUpdate& ax_tree_update = ax_event_params.update;
     ax_tree_update.node_id_to_clear = event.node_id_to_clear;
     for (size_t i = 0; i < event.nodes.size(); ++i) {
       ui::AXNodeData src = event.nodes[i];
       src.location.Offset(location_offset);
       linked_ptr<api::automation_internal::AXNodeData> out_node(
           new api::automation_internal::AXNodeData());
@@ skipping 10 matching lines @@
         api::automation_internal::OnAccessibilityEvent::kEventName,
         api::automation_internal::OnAccessibilityEvent::Create(
             ax_event_params));
   }
 }
 
 void DispatchTreeDestroyedEventToAutomation(
     int process_id,
     int routing_id,
     content::BrowserContext* browser_context) {
+    int tree_id =
+        ui::AXTreeIDRegistry::GetInstance()->GetOrCreateAXTreeID(
+            process_id, routing_id);
   DispatchEventInternal(
       browser_context,
       api::automation_internal::OnAccessibilityTreeDestroyed::kEventName,
       api::automation_internal::OnAccessibilityTreeDestroyed::Create(
-          process_id, routing_id));
+          tree_id));
+  ui::AXTreeIDRegistry::GetInstance()->RemoveAXTreeID(tree_id);
 }
 
 }  // namespace automation_util
 
 }  // namespace extensions