ui/gfx/compositor/compositor.cc - Issue 8561014: Fixes some asserts in compositor_unittests

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: ui/gfx/compositor/compositor.cc

Issue 8561014: Fixes some asserts in compositor_unittests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 1 month ago

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

Jump to:

Index: ui/gfx/compositor/compositor.cc

diff --git a/ui/gfx/compositor/compositor.cc b/ui/gfx/compositor/compositor.cc

index 485dc2d5c6468ff0ab368a7e944ea79b0a292784..97508f3bb9130d237f121b0c168562e4e4eec69f 100644

--- a/ui/gfx/compositor/compositor.cc

+++ b/ui/gfx/compositor/compositor.cc

@@ -35,6 +35,8 @@ void Compositor::ScheduleDraw() {

}

void Compositor::SetRootLayer(Layer* root_layer) {

+ if (root_layer_ == root_layer)

+ return;

if (root_layer_)

root_layer_->SetCompositor(NULL);

root_layer_ = root_layer;

« no previous file with comments | « no previous file | ui/gfx/compositor/layer_unittest.cc » ('j') | no next file with comments »