mojo/services/view_manager/view_manager_connection.cc - Issue 290703002: Map new subtrees when they are attached to the node hierarchy visible to a connection.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: mojo/services/view_manager/view_manager_connection.cc

Issue 290703002: Map new subtrees when they are attached to the node hierarchy visible to a connection. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 6 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc ('k') | mojo/services/view_manager/view_manager_connection_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 cac1ef3ec02fbd1ea22f825cf04bd9429f0a79c9..4621ab9aab0302b8e44ddb53e6556a461b2d3f72 100644

--- a/mojo/services/view_manager/view_manager_connection.cc

+++ b/mojo/services/view_manager/view_manager_connection.cc

@@ -121,12 +121,14 @@ void ViewManagerConnection::ProcessNodeViewReplaced(

bool originated_change) {

if (originated_change)

return;

- const TransportViewId new_view_id = new_view ?

- ViewIdToTransportId(new_view->id()) : 0;

- const TransportViewId old_view_id = old_view ?

- ViewIdToTransportId(old_view->id()) : 0;

- client()->OnNodeViewReplaced(NodeIdToTransportId(node->id()),

- new_view_id, old_view_id);

+ if (known_nodes_.count(NodeIdToTransportId(node->id())) > 0) {

+ const TransportViewId new_view_id = new_view ?

+ ViewIdToTransportId(new_view->id()) : 0;

+ const TransportViewId old_view_id = old_view ?

+ ViewIdToTransportId(old_view->id()) : 0;

+ client()->OnNodeViewReplaced(NodeIdToTransportId(node->id()),

+ new_view_id, old_view_id);

+ }

}

void ViewManagerConnection::ProcessNodeDeleted(

@@ -264,6 +266,7 @@ void ViewManagerConnection::CreateNode(

return;

}

node_map_[node_id.node_id] = new Node(this, node_id);

+ known_nodes_.insert(transport_node_id);

callback.Run(true);

}