ui/gfx/compositor/compositor_cc.cc - Issue 8510076: Fix stale compositor references from ui::Layer

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.cc

Issue 8510076: Fix stale compositor references from ui::Layer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix linux_touch build 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.cc

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

index 0d8b4fc42d510e42f0e3176a0acea5d099bc2386..ce757130e50bb064a4c1e8fff71912b5c94d9442 100644

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

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

@@ -174,7 +174,8 @@ void CompositorCC::OnWidgetSizeChanged() {

void CompositorCC::OnRootLayerChanged() {

root_web_layer_.removeAllChildren();

- root_web_layer_.addChild(root_layer()->web_layer());

+ if (root_layer())

+ root_web_layer_.addChild(root_layer()->web_layer());

}

void CompositorCC::DrawTree() {

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