ui/compositor/layer.cc - Issue 10956055: Revert 157567 - Revert 156318 - I had originally tried to build upon http://codereview.chromium.org…

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

Issue 10956055: Revert 157567 - Revert 156318 - I had originally tried to build upon http://codereview.chromium.org… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 3 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/layer.cc

===================================================================

--- ui/compositor/layer.cc (revision 158150)

+++ ui/compositor/layer.cc (working copy)

@@ -95,7 +95,9 @@

// Destroying the animator may cause observers to use the layer (and

// indirectly the WebLayer). Destroy the animator first so that the WebLayer

// is still around.

- animator_.reset();

+ if (animator_)

+ animator_->SetDelegate(NULL);

+ animator_ = NULL;

if (compositor_)

compositor_->SetRootLayer(NULL);

if (parent_)

@@ -174,7 +176,7 @@

void Layer::SetAnimator(LayerAnimator* animator) {

if (animator)

animator->SetDelegate(this);

- animator_.reset(animator);

+ animator_ = animator;

}

LayerAnimator* Layer::GetAnimator() {

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