ui/compositor/compositor.cc - Issue 1101823002: CC Animations: Make LayerAnimationController creation optional

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

Issue 1101823002: CC Animations: Make LayerAnimationController creation optional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Clean up. Created 5 years, 8 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

Index: ui/compositor/compositor.cc

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

index 14ceca4f9085784552b7062b3dc560ec8ccfcd8a..b14fc15635bf8979e8b46e5660c4793bd0e5f8b2 100644

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

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

@@ -164,7 +164,7 @@ Compositor::~Compositor() {

DCHECK(begin_frame_observer_list_.empty());

if (root_layer_)

- root_layer_->SetCompositor(NULL);

+ root_layer_->ResetCompositor();

// Stop all outstanding draws before telling the ContextFactory to tear

// down any contexts that the |host_| may rely upon.

@@ -186,13 +186,13 @@ void Compositor::SetRootLayer(Layer* root_layer) {

if (root_layer_ == root_layer)

return;

if (root_layer_)

- root_layer_->SetCompositor(NULL);

+ root_layer_->ResetCompositor();

root_layer_ = root_layer;

if (root_layer_ && !root_layer_->GetCompositor())

root_layer_->SetCompositor(this);

root_web_layer_->RemoveAllChildren();

if (root_layer_)

- root_web_layer_->AddChild(root_layer_->cc_layer());

+ root_layer_->SetCompositorRootLayer(root_web_layer_);

}

void Compositor::SetHostHasTransparentBackground(

« no previous file with comments | « content/test/web_layer_tree_view_impl_for_testing.cc ('k') | ui/compositor/dip_util.cc » ('j') | ui/compositor/layer.h » ('J')