ui/compositor/layer_animation_element.cc - Issue 420013002: Introduce NON_ZERO_DURATION for animation unit tests

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 420013002: Introduce NON_ZERO_DURATION for animation unit tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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:

Index: ui/compositor/layer_animation_element.cc

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

index c25e4a1dc9647ad3de449f74c24353fe89351582..663d156b2bf46b6ef68c75d9ba7689bf421c7225 100644

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

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

@@ -25,6 +25,7 @@ namespace {

// FAST_DURATION.

const int kSlowDurationScaleFactor = 4;

const int kFastDurationScaleFactor = 4;

+const int kTestDurationScaleFactor = 100;

oshima 2014/07/26 00:53:26 Can we rename to something like XxxDuratinoMultipl

James Cook 2014/07/26 04:02:32 Done.

// Pause -----------------------------------------------------------------------

class Pause : public LayerAnimationElement {

@@ -764,6 +765,8 @@ base::TimeDelta LayerAnimationElement::GetEffectiveDuration(

return duration / kFastDurationScaleFactor;

case ScopedAnimationDurationScaleMode::SLOW_DURATION:

return duration * kSlowDurationScaleFactor;

+ case ScopedAnimationDurationScaleMode::TEST_DURATION:

+ return duration / kTestDurationScaleFactor;

case ScopedAnimationDurationScaleMode::ZERO_DURATION:

return base::TimeDelta();

default:

« no previous file with comments | « ui/aura/window_unittest.cc ('k') | ui/compositor/layer_animator_unittest.cc » ('j') | no next file with comments »