Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(492)

Side by Side 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, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/aura/window_unittest.cc ('k') | ui/compositor/layer_animator_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/compositor/layer_animation_element.h" 5 #include "ui/compositor/layer_animation_element.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "cc/animation/animation.h" 8 #include "cc/animation/animation.h"
9 #include "cc/animation/animation_id_provider.h" 9 #include "cc/animation/animation_id_provider.h"
10 #include "ui/compositor/float_animation_curve_adapter.h" 10 #include "ui/compositor/float_animation_curve_adapter.h"
11 #include "ui/compositor/layer.h" 11 #include "ui/compositor/layer.h"
12 #include "ui/compositor/layer_animation_delegate.h" 12 #include "ui/compositor/layer_animation_delegate.h"
13 #include "ui/compositor/layer_animator.h" 13 #include "ui/compositor/layer_animator.h"
14 #include "ui/compositor/scoped_animation_duration_scale_mode.h" 14 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
15 #include "ui/compositor/transform_animation_curve_adapter.h" 15 #include "ui/compositor/transform_animation_curve_adapter.h"
16 #include "ui/gfx/animation/tween.h" 16 #include "ui/gfx/animation/tween.h"
17 #include "ui/gfx/interpolated_transform.h" 17 #include "ui/gfx/interpolated_transform.h"
18 18
19 namespace ui { 19 namespace ui {
20 20
21 namespace { 21 namespace {
22 22
23 // The factor by which duration is scaled up or down when 23 // The factor by which duration is scaled up or down when
24 // ScopedAnimationDurationScaleMode::duration_scale_mode() is SLOW_DURATION or 24 // ScopedAnimationDurationScaleMode::duration_scale_mode() is SLOW_DURATION or
25 // FAST_DURATION. 25 // FAST_DURATION.
26 const int kSlowDurationScaleFactor = 4; 26 const int kSlowDurationScaleFactor = 4;
27 const int kFastDurationScaleFactor = 4; 27 const int kFastDurationScaleFactor = 4;
28 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.
28 29
29 // Pause ----------------------------------------------------------------------- 30 // Pause -----------------------------------------------------------------------
30 class Pause : public LayerAnimationElement { 31 class Pause : public LayerAnimationElement {
31 public: 32 public:
32 Pause(AnimatableProperties properties, base::TimeDelta duration) 33 Pause(AnimatableProperties properties, base::TimeDelta duration)
33 : LayerAnimationElement(properties, duration) { 34 : LayerAnimationElement(properties, duration) {
34 } 35 }
35 virtual ~Pause() {} 36 virtual ~Pause() {}
36 37
37 private: 38 private:
(...skipping 719 matching lines...) Expand 10 before | Expand all | Expand 10 after
757 // static 758 // static
758 base::TimeDelta LayerAnimationElement::GetEffectiveDuration( 759 base::TimeDelta LayerAnimationElement::GetEffectiveDuration(
759 const base::TimeDelta& duration) { 760 const base::TimeDelta& duration) {
760 switch (ScopedAnimationDurationScaleMode::duration_scale_mode()) { 761 switch (ScopedAnimationDurationScaleMode::duration_scale_mode()) {
761 case ScopedAnimationDurationScaleMode::NORMAL_DURATION: 762 case ScopedAnimationDurationScaleMode::NORMAL_DURATION:
762 return duration; 763 return duration;
763 case ScopedAnimationDurationScaleMode::FAST_DURATION: 764 case ScopedAnimationDurationScaleMode::FAST_DURATION:
764 return duration / kFastDurationScaleFactor; 765 return duration / kFastDurationScaleFactor;
765 case ScopedAnimationDurationScaleMode::SLOW_DURATION: 766 case ScopedAnimationDurationScaleMode::SLOW_DURATION:
766 return duration * kSlowDurationScaleFactor; 767 return duration * kSlowDurationScaleFactor;
768 case ScopedAnimationDurationScaleMode::TEST_DURATION:
769 return duration / kTestDurationScaleFactor;
767 case ScopedAnimationDurationScaleMode::ZERO_DURATION: 770 case ScopedAnimationDurationScaleMode::ZERO_DURATION:
768 return base::TimeDelta(); 771 return base::TimeDelta();
769 default: 772 default:
770 NOTREACHED(); 773 NOTREACHED();
771 return base::TimeDelta(); 774 return base::TimeDelta();
772 } 775 }
773 } 776 }
774 777
775 // static 778 // static
776 LayerAnimationElement* LayerAnimationElement::CreateTransformElement( 779 LayerAnimationElement* LayerAnimationElement::CreateTransformElement(
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
843 } 846 }
844 847
845 // static 848 // static
846 LayerAnimationElement* LayerAnimationElement::CreateColorElement( 849 LayerAnimationElement* LayerAnimationElement::CreateColorElement(
847 SkColor color, 850 SkColor color,
848 base::TimeDelta duration) { 851 base::TimeDelta duration) {
849 return new ColorTransition(color, duration); 852 return new ColorTransition(color, duration);
850 } 853 }
851 854
852 } // namespace ui 855 } // namespace ui
OLDNEW
« no previous file with comments | « ui/aura/window_unittest.cc ('k') | ui/compositor/layer_animator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698