mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc - Issue 315863002: Fix destruction tests.

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/public/cpp/view_manager/lib/view_manager_synchronizer.cc

Issue 315863002: Fix destruction tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 6 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/service_manager/service_manager.cc ('k') | mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc

diff --git a/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc b/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc

index 77a9ce205e08ea2f558f2cd43d9e6a2ccc18e71e..62cab23569ea3d8d65690f48b6c3ea4a02f6c45d 100644

--- a/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc

+++ b/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.cc

@@ -604,8 +604,11 @@ void ViewManagerSynchronizer::OnNodeDeleted(uint32_t node_id,

next_server_change_id_ = server_change_id + 1;

ViewTreeNode* node = view_manager()->GetNodeById(node_id);

- if (node)

+ if (node) {

+ if (view_manager()->tree() == node)

+ ViewManagerPrivate(view_manager()).set_root(NULL);

ViewTreeNodePrivate(node).LocalDestroy();

+ }

}

void ViewManagerSynchronizer::OnNodeViewReplaced(uint32_t node_id,

« no previous file with comments | « mojo/service_manager/service_manager.cc ('k') | mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc » ('j') | no next file with comments »