| 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 8d4d0a6438ec31f1a7336fed2ddfdb1d7ab66464..104baf9fc4bff12d2ecc4491648dc47280fa8cd0 100644
|
| --- a/mojo/services/view_manager/view_manager_connection.cc
|
| +++ b/mojo/services/view_manager/view_manager_connection.cc
|
| @@ -389,10 +389,14 @@ bool ViewManagerConnection::AddRoots(
|
|
|
| did_add_root = true;
|
| roots_.insert(node_ids[i]);
|
| + Node* node = GetNode(NodeIdFromTransportId(node_ids[i]));
|
| + DCHECK(node);
|
| if (known_nodes_.count(node_ids[i]) == 0) {
|
| - Node* node = GetNode(NodeIdFromTransportId(node_ids[i]));
|
| - DCHECK(node);
|
| GetUnknownNodesFrom(node, &to_send);
|
| + } else {
|
| + // Even though the connection knows about the new root we need to tell it
|
| + // |node| is now a root.
|
| + to_send.push_back(node);
|
| }
|
| }
|
|
|
|
|