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

Side by Side Diff: cc/input/page_scale_animation.h

Issue 231133002: CC::Animations should use TimeTicks & TimeDelta to represent time (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated code as per the comments. Created 6 years, 7 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
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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 #ifndef CC_INPUT_PAGE_SCALE_ANIMATION_H_ 5 #ifndef CC_INPUT_PAGE_SCALE_ANIMATION_H_
6 #define CC_INPUT_PAGE_SCALE_ANIMATION_H_ 6 #define CC_INPUT_PAGE_SCALE_ANIMATION_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/time/time.h"
10 #include "ui/gfx/size.h" 11 #include "ui/gfx/size.h"
11 #include "ui/gfx/vector2d_f.h" 12 #include "ui/gfx/vector2d_f.h"
12 13
13 namespace cc { 14 namespace cc {
15
14 class TimingFunction; 16 class TimingFunction;
15 17
16 // A small helper class that does the math for zoom animations, primarily for 18 // A small helper class that does the math for zoom animations, primarily for
17 // double-tap zoom. Initialize it with starting and ending scroll/page scale 19 // double-tap zoom. Initialize it with starting and ending scroll/page scale
18 // positions and an animation length time, then call ...AtTime() at every frame 20 // positions and an animation length time, then call ...AtTime() at every frame
19 // to obtain the current interpolated position. The supplied timing function 21 // to obtain the current interpolated position. The supplied timing function
20 // is used to ease the animation. 22 // is used to ease the animation.
21 // 23 //
22 // All sizes and vectors in this class's public methods are in the root scroll 24 // All sizes and vectors in this class's public methods are in the root scroll
23 // layer's coordinate space. 25 // layer's coordinate space.
(...skipping 21 matching lines...) Expand all
45 // at the same position on the physical display throughout the animation, 47 // at the same position on the physical display throughout the animation,
46 // unless the edges of the root layer are hit. The anchor is specified 48 // unless the edges of the root layer are hit. The anchor is specified
47 // as an offset from the content layer. 49 // as an offset from the content layer.
48 void ZoomWithAnchor(const gfx::Vector2dF& anchor, 50 void ZoomWithAnchor(const gfx::Vector2dF& anchor,
49 float target_page_scale_factor, 51 float target_page_scale_factor,
50 double duration); 52 double duration);
51 53
52 // These should be called before the first frame of animation to initialize 54 // These should be called before the first frame of animation to initialize
53 // the start time. StartAnimation should only be called once after creation. 55 // the start time. StartAnimation should only be called once after creation.
54 bool IsAnimationStarted() const; 56 bool IsAnimationStarted() const;
55 void StartAnimation(double time); 57 void StartAnimation(base::TimeTicks time);
56 58
57 // Call these functions while the animation is in progress to output the 59 // Call these functions while the animation is in progress to output the
58 // current state. 60 // current state.
59 gfx::Vector2dF ScrollOffsetAtTime(double time) const; 61 gfx::Vector2dF ScrollOffsetAtTime(base::TimeTicks time) const;
60 float PageScaleFactorAtTime(double time) const; 62 float PageScaleFactorAtTime(base::TimeTicks time) const;
61 bool IsAnimationCompleteAtTime(double time) const; 63 bool IsAnimationCompleteAtTime(base::TimeTicks time) const;
62 64
63 // The following methods return state which is invariant throughout the 65 // The following methods return state which is invariant throughout the
64 // course of the animation. 66 // course of the animation.
65 double start_time() const { return start_time_; } 67 base::TimeTicks start_time() const { return start_time_; }
66 double duration() const { return duration_; } 68 base::TimeDelta duration() const { return duration_; }
67 double end_time() const { return start_time_ + duration_; } 69 base::TimeTicks end_time() const { return start_time_ + duration_; }
68 gfx::Vector2dF target_scroll_offset() const { return target_scroll_offset_; } 70 gfx::Vector2dF target_scroll_offset() const { return target_scroll_offset_; }
69 float target_page_scale_factor() const { return target_page_scale_factor_; } 71 float target_page_scale_factor() const { return target_page_scale_factor_; }
70 72
71 protected: 73 protected:
72 PageScaleAnimation(const gfx::Vector2dF& start_scroll_offset, 74 PageScaleAnimation(const gfx::Vector2dF& start_scroll_offset,
73 float start_page_scale_factor, 75 float start_page_scale_factor,
74 const gfx::SizeF& viewport_size, 76 const gfx::SizeF& viewport_size,
75 const gfx::SizeF& root_layer_size, 77 const gfx::SizeF& root_layer_size,
76 scoped_ptr<TimingFunction> timing_function); 78 scoped_ptr<TimingFunction> timing_function);
77 79
78 private: 80 private:
79 void ClampTargetScrollOffset(); 81 void ClampTargetScrollOffset();
80 void InferTargetScrollOffsetFromStartAnchor(); 82 void InferTargetScrollOffsetFromStartAnchor();
81 void InferTargetAnchorFromScrollOffsets(); 83 void InferTargetAnchorFromScrollOffsets();
82 84
83 gfx::SizeF StartViewportSize() const; 85 gfx::SizeF StartViewportSize() const;
84 gfx::SizeF TargetViewportSize() const; 86 gfx::SizeF TargetViewportSize() const;
85 float InterpAtTime(double time) const; 87 float InterpAtTime(base::TimeTicks time) const;
86 gfx::SizeF ViewportSizeAt(float interp) const; 88 gfx::SizeF ViewportSizeAt(float interp) const;
87 gfx::Vector2dF ScrollOffsetAt(float interp) const; 89 gfx::Vector2dF ScrollOffsetAt(float interp) const;
88 gfx::Vector2dF AnchorAt(float interp) const; 90 gfx::Vector2dF AnchorAt(float interp) const;
89 gfx::Vector2dF ViewportRelativeAnchorAt(float interp) const; 91 gfx::Vector2dF ViewportRelativeAnchorAt(float interp) const;
90 float PageScaleFactorAt(float interp) const; 92 float PageScaleFactorAt(float interp) const;
91 93
92 float start_page_scale_factor_; 94 float start_page_scale_factor_;
93 float target_page_scale_factor_; 95 float target_page_scale_factor_;
94 gfx::Vector2dF start_scroll_offset_; 96 gfx::Vector2dF start_scroll_offset_;
95 gfx::Vector2dF target_scroll_offset_; 97 gfx::Vector2dF target_scroll_offset_;
96 98
97 gfx::Vector2dF start_anchor_; 99 gfx::Vector2dF start_anchor_;
98 gfx::Vector2dF target_anchor_; 100 gfx::Vector2dF target_anchor_;
99 101
100 gfx::SizeF viewport_size_; 102 gfx::SizeF viewport_size_;
101 gfx::SizeF root_layer_size_; 103 gfx::SizeF root_layer_size_;
102 104
103 double start_time_; 105 base::TimeTicks start_time_;
104 double duration_; 106 base::TimeDelta duration_;
105 107
106 scoped_ptr<TimingFunction> timing_function_; 108 scoped_ptr<TimingFunction> timing_function_;
107 109
108 DISALLOW_COPY_AND_ASSIGN(PageScaleAnimation); 110 DISALLOW_COPY_AND_ASSIGN(PageScaleAnimation);
109 }; 111 };
110 112
111 } // namespace cc 113 } // namespace cc
112 114
113 #endif // CC_INPUT_PAGE_SCALE_ANIMATION_H_ 115 #endif // CC_INPUT_PAGE_SCALE_ANIMATION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698