Index: mojo/services/view_manager/view_manager_connection.cc |
diff --git a/mojo/services/view_manager/view_manager_connection.cc b/mojo/services/view_manager/view_manager_connection.cc |
index ed92cd519b12040734211865357ce3982674153b..2499204100caf6399098eafdbee82436033de88d 100644 |
--- a/mojo/services/view_manager/view_manager_connection.cc |
+++ b/mojo/services/view_manager/view_manager_connection.cc |
@@ -5,7 +5,6 @@ |
#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/type_converters.h" |
@@ -63,11 +62,10 @@ void ViewManagerConnection::OnConnectionEstablished() { |
root_node_manager_->AddConnection(this); |
std::vector<const Node*> to_send; |
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)); |
+ Array<INodePtr>::From(to_send)); |
} |
void ViewManagerConnection::OnConnectionError() {} |
@@ -104,14 +102,13 @@ void ViewManagerConnection::ProcessNodeHierarchyChanged( |
} |
return; |
} |
- AllocationScope allocation_scope; |
const NodeId new_parent_id(new_parent ? new_parent->id() : NodeId()); |
const NodeId old_parent_id(old_parent ? old_parent->id() : NodeId()); |
client()->OnNodeHierarchyChanged(NodeIdToTransportId(node->id()), |
NodeIdToTransportId(new_parent_id), |
NodeIdToTransportId(old_parent_id), |
server_change_id, |
- Array<INode>::From(to_send)); |
+ Array<INodePtr>::From(to_send)); |
} |
void ViewManagerConnection::ProcessNodeViewReplaced( |
@@ -278,7 +275,6 @@ void ViewManagerConnection::CreateNode( |
void ViewManagerConnection::DeleteNode( |
TransportNodeId transport_node_id, |
const Callback<void(bool)>& callback) { |
- AllocationScope allocation_scope; |
const NodeId node_id(NodeIdFromTransportId(transport_node_id)); |
bool did_delete = CanDeleteNode(node_id); |
if (did_delete) { |
@@ -330,14 +326,13 @@ void ViewManagerConnection::RemoveNodeFromParent( |
void ViewManagerConnection::GetNodeTree( |
TransportNodeId node_id, |
- const Callback<void(Array<INode>)>& callback) { |
- AllocationScope allocation_scope; |
+ const Callback<void(Array<INodePtr>)>& callback) { |
Node* node = GetNode(NodeIdFromTransportId(node_id)); |
std::vector<const 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)); |
+ callback.Run(Array<INodePtr>::From(nodes)); |
} |
void ViewManagerConnection::CreateView( |