Restricts node/view deletion to creator

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"
@@ skipping 54 matching lines @@
   GetUnknownNodesFrom(root_node_manager_->root(), &to_send);
   AllocationScope allocation_scope;
   client()->OnConnectionEstablished(
       id_,
       root_node_manager_->next_server_change_id(),
       Array<INode>::From(to_send));
 }
 
 void ViewManagerConnection::OnConnectionError() {}
 
-Node* ViewManagerConnection::GetNode(const NodeId& id) {
+const Node* ViewManagerConnection::GetNode(const NodeId& id) const {
   if (id_ == id.connection_id) {
-    NodeMap::iterator i = node_map_.find(id.node_id);
+    NodeMap::const_iterator i = node_map_.find(id.node_id);
     return i == node_map_.end() ? NULL : i->second;
   }
   return root_node_manager_->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;
   }
@@ skipping 58 matching lines @@
   }
 }
 
 void ViewManagerConnection::ProcessViewDeleted(const ViewId& view,
                                                bool originated_change) {
   if (originated_change)
     return;
   client()->OnViewDeleted(ViewIdToTransportId(view));
 }
 
+bool ViewManagerConnection::CanDeleteNode(const NodeId& node_id) const {
+  return node_id.connection_id == id_;
+}
+
+bool ViewManagerConnection::CanDeleteView(const ViewId& view_id) const {
+  return view_id.connection_id == id_;
+}
+
 bool ViewManagerConnection::DeleteNodeImpl(ViewManagerConnection* source,
                                            const NodeId& node_id) {
   DCHECK_EQ(node_id.connection_id, id_);
   Node* node = GetNode(node_id);
   if (!node)
     return false;
   RootNodeManager::ScopedChange change(
       source, root_node_manager_,
       RootNodeManager::CHANGE_TYPE_ADVANCE_SERVER_CHANGE_ID, true);
   if (node->GetParent())
@@ skipping 99 matching lines @@
   }
   node_map_[node_id.node_id] = new Node(this, node_id);
   callback.Run(true);
 }
 
 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 = root_node_manager_->GetConnection(
-      node_id.connection_id);
-  callback.Run(connection &&
-               connection->DeleteNodeImpl(this, node_id));
+  bool did_delete = CanDeleteNode(node_id);
+  if (did_delete) {
+    ViewManagerConnection* connection = root_node_manager_->GetConnection(
+        node_id.connection_id);
+    did_delete = connection && connection->DeleteNodeImpl(this, node_id);
+  }
+  callback.Run(did_delete);
 }
 
 void ViewManagerConnection::AddNode(
     TransportNodeId parent_id,
     TransportNodeId child_id,
     TransportChangeId server_change_id,
     const Callback<void(bool)>& callback) {
   bool success = false;
   if (server_change_id == root_node_manager_->next_server_change_id()) {
     Node* parent = GetNode(NodeIdFromTransportId(parent_id));
@@ skipping 49 matching lines @@
     return;
   }
   view_map_[view_id.view_id] = new View(view_id);
   callback.Run(true);
 }
 
 void ViewManagerConnection::DeleteView(
     TransportViewId transport_view_id,
     const Callback<void(bool)>& callback) {
   const ViewId view_id(ViewIdFromTransportId(transport_view_id));
-  ViewManagerConnection* connection = root_node_manager_->GetConnection(
-      view_id.connection_id);
-  callback.Run(connection && connection->DeleteViewImpl(this, view_id));
+  bool did_delete = CanDeleteView(view_id);
+  if (did_delete) {
+    ViewManagerConnection* connection = root_node_manager_->GetConnection(
+        view_id.connection_id);
+    did_delete = (connection && connection->DeleteViewImpl(this, view_id));
+  }
+  callback.Run(did_delete);
 }
 
 void ViewManagerConnection::SetView(
     TransportNodeId transport_node_id,
     TransportViewId transport_view_id,
     const Callback<void(bool)>& callback) {
   const NodeId node_id(NodeIdFromTransportId(transport_node_id));
   callback.Run(SetViewImpl(node_id, ViewIdFromTransportId(transport_view_id)));
 }
 
@@ skipping 24 matching lines @@
 
 void ViewManagerConnection::OnNodeViewReplaced(const Node* node,
                                                const View* new_view,
                                                const View* old_view) {
   root_node_manager_->ProcessNodeViewReplaced(node, new_view, old_view);
 }
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo