Fixes bug where IViewManagerClient could be messaged unnecessarily

mojo/services/view_manager/root_node_manager.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/root_node_manager.h"
 
 #include "base/logging.h"
 #include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
 #include "mojo/services/view_manager/view_manager_connection.h"
 #include "ui/aura/env.h"
 
 namespace mojo {
 namespace view_manager {
 namespace service {
 
 RootNodeManager::ScopedChange::ScopedChange(
     ViewManagerConnection* connection,
     RootNodeManager* root,
     RootNodeManager::ChangeType change_type,
     bool is_delete_node)
     : root_(root),
-      change_type_(change_type) {
-  root_->PrepareForChange(connection, is_delete_node);
+      connection_id_(connection->id()),
+      change_type_(change_type),
+      is_delete_node_(is_delete_node) {
+  root_->PrepareForChange(this);
 }
 
 RootNodeManager::ScopedChange::~ScopedChange() {
-  root_->FinishChange(change_type_);
+  root_->FinishChange();
 }
 
 RootNodeManager::Context::Context() {
   // Pass in false as native viewport creates the PlatformEventSource.
   aura::Env::CreateInstance(false);
 }
 
 RootNodeManager::Context::~Context() {
   aura::Env::DeleteInstance();
 }
 
 RootNodeManager::RootNodeManager(ServiceProvider* service_provider,
                                  RootViewManagerDelegate* view_manager_delegate)
     : service_provider_(service_provider),
       next_connection_id_(1),
       next_server_change_id_(1),
-      change_source_(kRootConnection),
-      is_processing_delete_node_(false),
       root_view_manager_(service_provider, this, view_manager_delegate),
-      root_(this, RootNodeId()) {
+      root_(this, RootNodeId()),
+      current_change_(NULL) {
 }
 
 RootNodeManager::~RootNodeManager() {
   while (!connections_created_by_connect_.empty())
     delete *(connections_created_by_connect_.begin());
   // All the connections should have been destroyed.
   DCHECK(connection_map_.empty());
 }
 
 TransportConnectionId RootNodeManager::GetAndAdvanceNextConnectionId() {
@@ skipping 35 matching lines @@
     return &root_;
   ConnectionMap::iterator i = connection_map_.find(id.connection_id);
   return i == connection_map_.end() ? NULL : i->second->GetNode(id);
 }
 
 View* RootNodeManager::GetView(const ViewId& id) {
   ConnectionMap::iterator i = connection_map_.find(id.connection_id);
   return i == connection_map_.end() ? NULL : i->second->GetView(id);
 }
 
+void RootNodeManager::OnConnectionMessagedClient(TransportConnectionId id) {
+  if (current_change_)
+    current_change_->MarkConnectionAsMessaged(id);
+}
+
+bool RootNodeManager::DidConnectionMessageClient(
+    TransportConnectionId id) const {
+  return current_change_ && current_change_->DidMessageConnection(id);
+}
+
 void RootNodeManager::ProcessNodeBoundsChanged(const Node* node,
                                                const gfx::Rect& old_bounds,
                                                const gfx::Rect& new_bounds) {
   for (ConnectionMap::iterator i = connection_map_.begin();
        i != connection_map_.end(); ++i) {
     i->second->ProcessNodeBoundsChanged(node, old_bounds, new_bounds,
                                         IsChangeSource(i->first));
   }
 }
 
@@ skipping 26 matching lines @@
   }
 }
 
 void RootNodeManager::ProcessViewDeleted(const ViewId& view) {
   for (ConnectionMap::iterator i = connection_map_.begin();
        i != connection_map_.end(); ++i) {
     i->second->ProcessViewDeleted(view, IsChangeSource(i->first));
   }
 }
 
-void RootNodeManager::PrepareForChange(ViewManagerConnection* connection,
-                                       bool is_delete_node) {
+void RootNodeManager::PrepareForChange(ScopedChange* change) {
   // Should only ever have one change in flight.
-  DCHECK_EQ(kRootConnection, change_source_);
-  change_source_ = connection->id();
-  is_processing_delete_node_ = is_delete_node;
+  CHECK(!current_change_);
+  current_change_ = change;
 }
 
-void RootNodeManager::FinishChange(ChangeType change_type) {
+void RootNodeManager::FinishChange() {
   // PrepareForChange/FinishChange should be balanced.
-  DCHECK_NE(kRootConnection, change_source_);
-  change_source_ = 0;
-  is_processing_delete_node_ = false;
-  if (change_type == CHANGE_TYPE_ADVANCE_SERVER_CHANGE_ID)
+  CHECK(current_change_);
+  if (current_change_->change_type() == CHANGE_TYPE_ADVANCE_SERVER_CHANGE_ID)
     next_server_change_id_++;
+  current_change_ = NULL;
 }
 
 ViewManagerConnection* RootNodeManager::ConnectImpl(
     const String& url,
     const Array<TransportNodeId>& node_ids) {
   MessagePipe pipe;
   service_provider_->ConnectToService(url, pipe.handle1.Pass());
   ViewManagerConnection* connection = new ViewManagerConnection(this);
   connection->SetRoots(node_ids);
   BindToPipe(connection, pipe.handle0.Pass());
@@ skipping 10 matching lines @@
 
 void RootNodeManager::OnNodeViewReplaced(const Node* node,
                                          const View* new_view,
                                          const View* old_view) {
   ProcessNodeViewReplaced(node, new_view, old_view);
 }
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo