Move some AX attrs from AXNodeData to AXTreeData.

ui/accessibility/ax_tree.cc

 // Copyright 2013 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 "ui/accessibility/ax_tree.h"
 
 #include <set>
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
@@ skipping 35 matching lines @@
 
 AXTreeDelegate::~AXTreeDelegate() {
 }
 
 AXTree::AXTree()
     : delegate_(NULL), root_(NULL) {
   AXNodeData root;
   root.id = -1;
   root.role = AX_ROLE_ROOT_WEB_AREA;
 
-  AXTreeUpdate<AXNodeData> initial_state;
+  AXTreeUpdate initial_state;
   initial_state.nodes.push_back(root);
   CHECK(Unserialize(initial_state)) << error();
 }
 
-AXTree::AXTree(const AXTreeUpdate<AXNodeData>& initial_state)
+AXTree::AXTree(const AXTreeUpdate& initial_state)
     : delegate_(NULL), root_(NULL) {
   CHECK(Unserialize(initial_state)) << error();
 }
 
 AXTree::~AXTree() {
   if (root_)
     DestroyNodeAndSubtree(root_, nullptr);
 }
 
 void AXTree::SetDelegate(AXTreeDelegate* delegate) {
   delegate_ = delegate;
 }
 
 AXNode* AXTree::GetFromId(int32 id) const {
   base::hash_map<int32, AXNode*>::const_iterator iter = id_map_.find(id);
   return iter != id_map_.end() ? iter->second : NULL;
 }
 
-bool AXTree::Unserialize(const AXTreeUpdate<AXNodeData>& update) {
+void AXTree::UpdateData(const AXTreeData& data) {
+  data_ = data;
+  if (delegate_)
+    delegate_->OnTreeDataChanged(this);
+}
+
+bool AXTree::Unserialize(const AXTreeUpdate& update) {
   AXTreeUpdateState update_state;
   int32 old_root_id = root_ ? root_->id() : 0;
 
+  if (update.has_tree_data)
+    UpdateData(update.tree_data);
+
   if (update.node_id_to_clear != 0) {
     AXNode* node = GetFromId(update.node_id_to_clear);
     if (!node) {
       error_ = base::StringPrintf("Bad node_id_to_clear: %d",
                                   update.node_id_to_clear);
       return false;
     }
     if (node == root_) {
       // Clear root_ before calling DestroySubtree so that root_ doesn't
       // ever point to an invalid node.
@@ skipping 43 matching lines @@
       }
     }
     delegate_->OnAtomicUpdateFinished(
         this, root_->id() != old_root_id, changes);
   }
 
   return true;
 }
 
 std::string AXTree::ToString() const {
-  return TreeToStringHelper(root_, 0);
+  return "AXTree" + data_.ToString() + "\n" + TreeToStringHelper(root_, 0);
 }
 
 AXNode* AXTree::CreateNode(AXNode* parent, int32 id, int32 index_in_parent) {
   AXNode* new_node = new AXNode(parent, id, index_in_parent);
   id_map_[new_node->id()] = new_node;
   if (delegate_)
     delegate_->OnNodeCreated(this, new_node);
   return new_node;
 }
 
@@ skipping 134 matching lines @@
       update_state->pending_nodes.insert(child);
       update_state->new_nodes.insert(child);
     }
     new_children->push_back(child);
   }
 
   return success;
 }
 
 }  // namespace ui