Revert 270925 "Tweaks to ViewManager:"

trunk/src/mojo/services/view_manager/view_manager_connection.cc

Index: trunk/src/mojo/services/view_manager/view_manager_connection.cc
===================================================================
--- trunk/src/mojo/services/view_manager/view_manager_connection.cc	(revision 270932)
+++ trunk/src/mojo/services/view_manager/view_manager_connection.cc	(working copy)
@@ -8,7 +8,6 @@
 #include "mojo/public/cpp/bindings/allocation_scope.h"
 #include "mojo/services/view_manager/node.h"
 #include "mojo/services/view_manager/root_node_manager.h"
-#include "mojo/services/view_manager/type_converters.h"
 #include "mojo/services/view_manager/view.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/aura/window.h"
@@ -19,16 +18,43 @@
 namespace service {
 namespace {
 
-// Places |node| in |nodes| and recurses through the children.
-void GetDescendants(Node* node, std::vector<Node*>* nodes) {
+// Implementation of NodeCount(). |count| is the current count.
+void NodeCountImpl(Node* node, size_t* count) {
+  (*count)++;
+  std::vector<Node*> children(node->GetChildren());
+  for (size_t i = 0 ; i < children.size(); ++i)
+    NodeCountImpl(children[i], count);
+}
+
+// Returns the number of descendants of |node|.
+size_t NodeCount(Node* node) {
+  size_t count = 0;
+  if (node)
+    NodeCountImpl(node, &count);
+  return count;
+}
+
+// Converts a Node to an INode, putting the result at |index| in
+// |array_builder|. This then recurses through the children.
+void NodeToINode(Node* node,
+                 Array<INode>::Builder* array_builder,
+                 size_t* index) {
   if (!node)
     return;
 
-  nodes->push_back(node);
+  INode::Builder builder;
+  Node* parent = node->GetParent();
+  builder.set_parent_id(NodeIdToTransportId(parent ? parent->id() : NodeId()));
+  builder.set_node_id(NodeIdToTransportId(node->id()));
+  builder.set_view_id(ViewIdToTransportId(
+                          node->view() ? node->view()->id() : ViewId()));
+  (*array_builder)[*index] = builder.Finish();
 
   std::vector<Node*> children(node->GetChildren());
-  for (size_t i = 0 ; i < children.size(); ++i)
-    GetDescendants(children[i], nodes);
+  for (size_t i = 0 ; i < children.size(); ++i) {
+    (*index)++;
+    NodeToINode(children[i], array_builder, index);
+  }
 }
 
 }  // namespace
@@ -59,12 +85,7 @@
   DCHECK_EQ(0, id_);  // Should only get Initialize() once.
   id_ = context()->GetAndAdvanceNextConnectionId();
   context()->AddConnection(this);
-  std::vector<Node*> to_send;
-  GetUnknownNodesFrom(context()->root(), &to_send);
-  AllocationScope allocation_scope;
-  client()->OnConnectionEstablished(id_,
-                                    context()->next_server_change_id(),
-                                    Array<INode>::From(to_send));
+  client()->OnConnectionEstablished(id_, context()->next_server_change_id());
 }
 
 Node* ViewManagerConnection::GetNode(const NodeId& id) {
@@ -83,62 +104,33 @@
   return context()->GetView(id);
 }
 
-void ViewManagerConnection::ProcessNodeHierarchyChanged(
-    const NodeId& node_id,
-    const NodeId& new_parent_id,
-    const NodeId& old_parent_id,
-    TransportChangeId server_change_id,
-    bool originated_change) {
-  if (originated_change || context()->is_processing_delete_node())
-    return;
-  std::vector<Node*> to_send;
-  if (!ShouldNotifyOnHierarchyChange(node_id, new_parent_id, old_parent_id,
-                                     &to_send)) {
-    if (context()->IsProcessingChange()) {
-      client()->OnServerChangeIdAdvanced(
-          context()->next_server_change_id() + 1);
-    }
-    return;
-  }
-  AllocationScope allocation_scope;
-  client()->OnNodeHierarchyChanged(NodeIdToTransportId(node_id),
-                                   NodeIdToTransportId(new_parent_id),
-                                   NodeIdToTransportId(old_parent_id),
-                                   server_change_id,
-                                   Array<INode>::From(to_send));
+void ViewManagerConnection::NotifyNodeHierarchyChanged(
+    const NodeId& node,
+    const NodeId& new_parent,
+    const NodeId& old_parent,
+    TransportChangeId server_change_id) {
+  client()->OnNodeHierarchyChanged(NodeIdToTransportId(node),
+                                   NodeIdToTransportId(new_parent),
+                                   NodeIdToTransportId(old_parent),
+                                   server_change_id);
 }
 
-void ViewManagerConnection::ProcessNodeViewReplaced(
+void ViewManagerConnection::NotifyNodeViewReplaced(
     const NodeId& node,
     const ViewId& new_view_id,
-    const ViewId& old_view_id,
-    bool originated_change) {
-  if (originated_change)
-    return;
+    const ViewId& old_view_id) {
   client()->OnNodeViewReplaced(NodeIdToTransportId(node),
                                ViewIdToTransportId(new_view_id),
                                ViewIdToTransportId(old_view_id));
 }
 
-void ViewManagerConnection::ProcessNodeDeleted(
+void ViewManagerConnection::NotifyNodeDeleted(
     const NodeId& node,
-    TransportChangeId server_change_id,
-    bool originated_change) {
-  const bool in_known = known_nodes_.erase(NodeIdToTransportId(node)) > 0;
-
-  if (originated_change)
-    return;
-
-  if (in_known)
-    client()->OnNodeDeleted(NodeIdToTransportId(node), server_change_id);
-  else if (context()->IsProcessingChange())
-    client()->OnServerChangeIdAdvanced(context()->next_server_change_id() + 1);
+    TransportChangeId server_change_id) {
+  client()->OnNodeDeleted(NodeIdToTransportId(node), server_change_id);
 }
 
-void ViewManagerConnection::ProcessViewDeleted(const ViewId& view,
-                                               bool originated_change) {
-  if (originated_change)
-    return;
+void ViewManagerConnection::NotifyViewDeleted(const ViewId& view) {
   client()->OnViewDeleted(ViewIdToTransportId(view));
 }
 
@@ -149,8 +141,7 @@
   if (!node)
     return false;
   RootNodeManager::ScopedChange change(
-      source, context(), RootNodeManager::CHANGE_TYPE_ADVANCE_SERVER_CHANGE_ID,
-      true);
+      source, context(), RootNodeManager::CHANGE_TYPE_ADVANCE_SERVER_CHANGE_ID);
   if (node->GetParent())
     node->GetParent()->Remove(node);
   std::vector<Node*> children(node->GetChildren());
@@ -160,7 +151,7 @@
   node_map_.erase(node_id.node_id);
   delete node;
   node = NULL;
-  context()->ProcessNodeDeleted(node_id);
+  context()->NotifyNodeDeleted(node_id);
   return true;
 }
 
@@ -172,7 +163,7 @@
     return false;
   RootNodeManager::ScopedChange change(
       source, context(),
-      RootNodeManager::CHANGE_TYPE_DONT_ADVANCE_SERVER_CHANGE_ID, false);
+      RootNodeManager::CHANGE_TYPE_DONT_ADVANCE_SERVER_CHANGE_ID);
   if (view->node())
     view->node()->SetView(NULL);
   view_map_.erase(view_id.view_id);
@@ -180,7 +171,7 @@
   // valid.
   const ViewId view_id_copy(view_id);
   delete view;
-  context()->ProcessViewDeleted(view_id_copy);
+  context()->NotifyViewDeleted(view_id_copy);
   return true;
 }
 
@@ -194,56 +185,11 @@
     return false;
   RootNodeManager::ScopedChange change(
       this, context(),
-      RootNodeManager::CHANGE_TYPE_DONT_ADVANCE_SERVER_CHANGE_ID, false);
+      RootNodeManager::CHANGE_TYPE_DONT_ADVANCE_SERVER_CHANGE_ID);
   node->SetView(view);
   return true;
 }
 
-void ViewManagerConnection::GetUnknownNodesFrom(
-    Node* node,
-    std::vector<Node*>* nodes) {
-  const TransportNodeId transport_id = NodeIdToTransportId(node->id());
-  if (known_nodes_.count(transport_id) == 1)
-    return;
-  nodes->push_back(node);
-  known_nodes_.insert(transport_id);
-  std::vector<Node*> children(node->GetChildren());
-  for (size_t i = 0 ; i < children.size(); ++i)
-    GetUnknownNodesFrom(children[i], nodes);
-}
-
-bool ViewManagerConnection::ShouldNotifyOnHierarchyChange(
-    const NodeId& node_id,
-    const NodeId& new_parent_id,
-    const NodeId& old_parent_id,
-    std::vector<Node*>* to_send) {
-  Node* new_parent = GetNode(new_parent_id);
-  if (new_parent) {
-    // On getting a new parent we may need to communicate new nodes to the
-    // client. We do that in the following cases:
-    // . New parent is a descendant of the root. In this case the client already
-    //   knows all ancestors, so we only have to communicate descendants of node
-    //   the client doesn't know about.
-    // . If the client knew about the parent, we have to do the same.
-    // . If the client knows about the node and is added to a tree the client
-    //   doesn't know about we have to communicate from the root down (the
-    //   client is learning about a new root).
-    if (context()->root()->Contains(new_parent) ||
-        known_nodes_.count(NodeIdToTransportId(new_parent_id))) {
-      GetUnknownNodesFrom(GetNode(node_id), to_send);
-      return true;
-    }
-    // If parent wasn't known we have to communicate from the root down.
-    if (known_nodes_.count(NodeIdToTransportId(node_id))) {
-      GetUnknownNodesFrom(new_parent->GetRoot(), to_send);
-      return true;
-    }
-  }
-  // Otherwise only communicate the change if the node was known. We shouldn't
-  // need to communicate any nodes on a remove.
-  return known_nodes_.count(NodeIdToTransportId(node_id));
-}
-
 void ViewManagerConnection::CreateNode(
     TransportNodeId transport_node_id,
     const Callback<void(bool)>& callback) {
@@ -260,7 +206,6 @@
 void ViewManagerConnection::DeleteNode(
     TransportNodeId transport_node_id,
     const Callback<void(bool)>& callback) {
-  AllocationScope allocation_scope;
   const NodeId node_id(NodeIdFromTransportId(transport_node_id));
   ViewManagerConnection* connection = context()->GetConnection(
       node_id.connection_id);
@@ -282,7 +227,7 @@
       success = true;
       RootNodeManager::ScopedChange change(
           this, context(),
-          RootNodeManager::CHANGE_TYPE_ADVANCE_SERVER_CHANGE_ID, false);
+          RootNodeManager::CHANGE_TYPE_ADVANCE_SERVER_CHANGE_ID);
       parent->Add(child);
     }
   }
@@ -300,7 +245,7 @@
       success = true;
       RootNodeManager::ScopedChange change(
           this, context(),
-          RootNodeManager::CHANGE_TYPE_ADVANCE_SERVER_CHANGE_ID, false);
+          RootNodeManager::CHANGE_TYPE_ADVANCE_SERVER_CHANGE_ID);
       node->GetParent()->Remove(node);
     }
   }
@@ -312,11 +257,12 @@
     const Callback<void(Array<INode>)>& callback) {
   AllocationScope allocation_scope;
   Node* node = GetNode(NodeIdFromTransportId(node_id));
-  std::vector<Node*> nodes;
-  GetDescendants(node, &nodes);
-  for (size_t i = 0; i < nodes.size(); ++i)
-    known_nodes_.insert(NodeIdToTransportId(nodes[i]->id()));
-  callback.Run(Array<INode>::From(nodes));
+  Array<INode>::Builder array_builder(NodeCount(node));
+  {
+    size_t index = 0;
+    NodeToINode(node, &array_builder, &index);
+  }
+  callback.Run(array_builder.Finish());
 }
 
 void ViewManagerConnection::CreateView(
@@ -370,13 +316,13 @@
 void ViewManagerConnection::OnNodeHierarchyChanged(const NodeId& node,
                                                    const NodeId& new_parent,
                                                    const NodeId& old_parent) {
-  context()->ProcessNodeHierarchyChanged(node, new_parent, old_parent);
+  context()->NotifyNodeHierarchyChanged(node, new_parent, old_parent);
 }
 
 void ViewManagerConnection::OnNodeViewReplaced(const NodeId& node,
                                                const ViewId& new_view_id,
                                                const ViewId& old_view_id) {
-  context()->ProcessNodeViewReplaced(node, new_view_id, old_view_id);
+  context()->NotifyNodeViewReplaced(node, new_view_id, old_view_id);
 }
 
 }  // namespace service