ui/compositor/layer_animation_element.cc - Issue 18786006: Merge 210753 "Make ui::ThreadedTransformTransition::OnAbort corr..."

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

Issue 18786006: Merge 210753 "Make ui::ThreadedTransformTransition::OnAbort corr..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1547/src/

Patch Set: Created 7 years, 5 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_animation_element.cc

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

--- ui/compositor/layer_animation_element.cc (revision 211166)

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

@@ -517,7 +517,7 @@

}

virtual void OnAbort(LayerAnimationDelegate* delegate) OVERRIDE {

- if (delegate && animation_id()) {

+ if (delegate && Started()) {

ThreadedLayerAnimationElement::OnAbort(delegate);

delegate->SetTransformFromAnimation(Tween::ValueBetween(

Tween::CalculateValue(tween_type(), last_progressed_fraction()),

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