Re-land: Add a window property to associate RWHVA with its child AX tree ID

ui/views/accessibility/ax_window_obj_wrapper.cc

Index: ui/views/accessibility/ax_window_obj_wrapper.cc
diff --git a/ui/views/accessibility/ax_window_obj_wrapper.cc b/ui/views/accessibility/ax_window_obj_wrapper.cc
index b2d80b9b325660f2dacb1a17f8d089a50cd1890c..4352db0109aaa9b011135308023987aed1fe1b2f 100644
--- a/ui/views/accessibility/ax_window_obj_wrapper.cc
+++ b/ui/views/accessibility/ax_window_obj_wrapper.cc
@@ -8,6 +8,7 @@
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_node_data.h"
+#include "ui/accessibility/platform/aura_window_properties.h"
 #include "ui/aura/window.h"
 #include "ui/views/accessibility/ax_aura_obj_cache.h"
 #include "ui/views/widget/widget.h"
@@ -54,6 +55,11 @@ void AXWindowObjWrapper::Serialize(ui::AXNodeData* out_node_data) {
                                     base::UTF16ToUTF8(window_->GetTitle()));
   out_node_data->state = 0;
   out_node_data->location = gfx::RectF(window_->bounds());
+
+  ui::AXTreeIDRegistry::AXTreeID child_ax_tree_id =
+      window_->GetProperty(ui::kChildAXTreeID);
+  if (child_ax_tree_id != ui::AXTreeIDRegistry::kNoAXTreeID)
+    out_node_data->AddIntAttribute(ui::AX_ATTR_CHILD_TREE_ID, child_ax_tree_id);
 }
 
 int32_t AXWindowObjWrapper::GetID() {