Introduces another change id to hierarchy mutations

mojo/services/view_manager/view_manager_connection.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 "mojo/services/view_manager/view_manager_connection.h"
 
 #include "base/stl_util.h"
 #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/view.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/aura/window.h"
 #include "ui/gfx/codec/png_codec.h"
 
 namespace mojo {
 namespace services {
 namespace view_manager {
 namespace {
 
 // Implementation of NodeCount(). |count| is the current count.
 void NodeCountImpl(Node* node, size_t* count) {
   (*count)++;
@@ skipping 54 matching lines @@
   }
 
   STLDeleteContainerPairSecondPointers(node_map_.begin(), node_map_.end());
   context()->RemoveConnection(this);
 }
 
 void ViewManagerConnection::Initialize() {
   DCHECK_EQ(0, id_);  // Should only get Initialize() once.
   id_ = context()->GetAndAdvanceNextConnectionId();
   context()->AddConnection(this);
-  client_->OnConnectionEstablished(id_);
+  client_->OnConnectionEstablished(id_, context()->next_server_change_id());
 }
 
 Node* ViewManagerConnection::GetNode(const NodeId& id) {
   if (id_ == id.connection_id) {
     NodeMap::iterator i = node_map_.find(id.node_id);
     return i == node_map_.end() ? NULL : i->second;
   }
   return context()->GetNode(id);
 }
 
 View* ViewManagerConnection::GetView(const ViewId& id) {
   if (id_ == id.connection_id) {
     ViewMap::const_iterator i = view_map_.find(id.view_id);
     return i == view_map_.end() ? NULL : i->second;
   }
   return context()->GetView(id);
 }
 
 void ViewManagerConnection::NotifyNodeHierarchyChanged(
     const NodeId& node,
     const NodeId& new_parent,
     const NodeId& old_parent,
-    TransportChangeId change_id) {
+    TransportChangeId server_change_id,
+    TransportChangeId client_change_id) {
   client_->OnNodeHierarchyChanged(NodeIdToTransportId(node),
-                                   NodeIdToTransportId(new_parent),
-                                   NodeIdToTransportId(old_parent),
-                                   change_id);
+                                  NodeIdToTransportId(new_parent),
+                                  NodeIdToTransportId(old_parent),
+                                  server_change_id,
+                                  client_change_id);
 }
 
 void ViewManagerConnection::NotifyNodeViewReplaced(
     const NodeId& node,
     const ViewId& new_view_id,
     const ViewId& old_view_id,
-    TransportChangeId change_id) {
+    TransportChangeId client_change_id) {
   client_->OnNodeViewReplaced(NodeIdToTransportId(node),
-                               ViewIdToTransportId(new_view_id),
-                               ViewIdToTransportId(old_view_id),
-                               change_id);
+                              ViewIdToTransportId(new_view_id),
+                              ViewIdToTransportId(old_view_id),
+                              client_change_id);
 }
 
-void ViewManagerConnection::NotifyNodeDeleted(const NodeId& node,
-                                              TransportChangeId change_id) {
-  client_->OnNodeDeleted(NodeIdToTransportId(node), change_id);
+void ViewManagerConnection::NotifyNodeDeleted(
+    const NodeId& node,
+    TransportChangeId server_change_id,
+    TransportChangeId client_change_id) {
+  client_->OnNodeDeleted(NodeIdToTransportId(node), server_change_id,
+                         client_change_id);
 }
 
 bool ViewManagerConnection::DeleteNodeImpl(ViewManagerConnection* source,
                                            const NodeId& node_id,
                                            TransportChangeId change_id) {
   DCHECK_EQ(node_id.connection_id, id_);
   Node* node = GetNode(node_id);
   if (!node)
     return false;
-  RootNodeManager::ScopedChange change(source, context(), change_id);
+  RootNodeManager::ScopedChange change(
+      source, context(), change_id,
+      RootNodeManager::CHANGE_TYPE_ADVANCE_SERVER_CHANGE_ID);
   if (node->GetParent())
     node->GetParent()->Remove(node);
   std::vector<Node*> children(node->GetChildren());
   for (size_t i = 0; i < children.size(); ++i)
     node->Remove(children[i]);
   DCHECK(node->GetChildren().empty());
   node_map_.erase(node_id.node_id);
   delete node;
+  node = NULL;
   context()->NotifyNodeDeleted(node_id);
   return true;
 }
 
 bool ViewManagerConnection::DeleteViewImpl(ViewManagerConnection* source,
                                            const ViewId& view_id,
                                            TransportChangeId change_id) {
   DCHECK_EQ(view_id.connection_id, id_);
   View* view = GetView(view_id);
   if (!view)
     return false;
-  RootNodeManager::ScopedChange change(source, context(), change_id);
+  RootNodeManager::ScopedChange change(
+      source, context(), change_id,
+      RootNodeManager::CHANGE_TYPE_DONT_ADVANCE_SERVER_CHANGE_ID);
   if (view->node())
     view->node()->SetView(NULL);
   view_map_.erase(view_id.view_id);
   delete view;
   return true;
 }
 
 bool ViewManagerConnection::SetViewImpl(const NodeId& node_id,
                                         const ViewId& view_id,
                                         TransportChangeId change_id) {
   Node* node = GetNode(node_id);
   if (!node)
     return false;
   View* view = GetView(view_id);
   if (!view && view_id != ViewId())
     return false;
-  RootNodeManager::ScopedChange change(this, context(), change_id);
+  RootNodeManager::ScopedChange change(
+      this, context(), change_id,
+      RootNodeManager::CHANGE_TYPE_DONT_ADVANCE_SERVER_CHANGE_ID);
   node->SetView(view);
   return true;
 }
 
 void ViewManagerConnection::SetClient(IViewManagerClient* client) {
   client_ = client;
 }
 
 void ViewManagerConnection::CreateNode(
     TransportConnectionSpecificNodeId node_id,
@@ skipping 14 matching lines @@
   const NodeId node_id(NodeIdFromTransportId(transport_node_id));
   ViewManagerConnection* connection = context()->GetConnection(
       node_id.connection_id);
   callback.Run(connection &&
                connection->DeleteNodeImpl(this, node_id, change_id));
 }
 
 void ViewManagerConnection::AddNode(
     TransportNodeId parent_id,
     TransportNodeId child_id,
-    TransportChangeId change_id,
+    TransportChangeId server_change_id,
+    TransportChangeId client_change_id,
     const Callback<void(bool)>& callback) {
-  Node* parent = GetNode(NodeIdFromTransportId(parent_id));
-  Node* child = GetNode(NodeIdFromTransportId(child_id));
-  const bool success = parent && child && parent != child;
-  if (success) {
-    RootNodeManager::ScopedChange change(this, context(), change_id);
-    parent->Add(child);
+  bool success = false;
+  if (server_change_id == context()->next_server_change_id()) {
+    Node* parent = GetNode(NodeIdFromTransportId(parent_id));
+    Node* child = GetNode(NodeIdFromTransportId(child_id));
+    if (parent && child && child->GetParent() != parent &&
+        !child->window()->Contains(parent->window())) {
+      success = true;
+      RootNodeManager::ScopedChange change(
+          this, context(), client_change_id,
+          RootNodeManager::CHANGE_TYPE_ADVANCE_SERVER_CHANGE_ID);
+      parent->Add(child);
+    }
   }
   callback.Run(success);
 }
 
 void ViewManagerConnection::RemoveNodeFromParent(
     TransportNodeId node_id,
-    TransportChangeId change_id,
+    TransportChangeId server_change_id,
+    TransportChangeId client_change_id,
     const Callback<void(bool)>& callback) {
-  Node* node = GetNode(NodeIdFromTransportId(node_id));
-  const bool success = (node && node->GetParent());
-  if (success) {
-    RootNodeManager::ScopedChange change(this, context(), change_id);
-    node->GetParent()->Remove(node);
+  bool success = false;
+  if (server_change_id == context()->next_server_change_id()) {
+    Node* node = GetNode(NodeIdFromTransportId(node_id));
+    if (node && node->GetParent()) {
+      success = true;
+      RootNodeManager::ScopedChange change(
+          this, context(), client_change_id,
+          RootNodeManager::CHANGE_TYPE_ADVANCE_SERVER_CHANGE_ID);
+      node->GetParent()->Remove(node);
+    }
   }
   callback.Run(success);
 }
 
 void ViewManagerConnection::GetNodeTree(
     TransportNodeId node_id,
     const Callback<void(Array<INode>)>& callback) {
   AllocationScope allocation_scope;
   Node* node = GetNode(NodeIdFromTransportId(node_id));
   Array<INode>::Builder array_builder(NodeCount(node));
@@ skipping 63 matching lines @@
 
 void ViewManagerConnection::OnNodeViewReplaced(const NodeId& node,
                                                const ViewId& new_view_id,
                                                const ViewId& old_view_id) {
   context()->NotifyNodeViewReplaced(node, new_view_id, old_view_id);
 }
 
 }  // namespace view_manager
 }  // namespace services
 }  // namespace mojo