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

Side by Side Diff: cc/animation/scroll_offset_animation_curve.h

Issue 628443002: replace OVERRIDE and FINAL with override and final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_ANIMATION_SCROLL_OFFSET_ANIMATION_CURVE_H_ 5 #ifndef CC_ANIMATION_SCROLL_OFFSET_ANIMATION_CURVE_H_
6 #define CC_ANIMATION_SCROLL_OFFSET_ANIMATION_CURVE_H_ 6 #define CC_ANIMATION_SCROLL_OFFSET_ANIMATION_CURVE_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "cc/animation/animation_curve.h" 10 #include "cc/animation/animation_curve.h"
(...skipping 11 matching lines...) Expand all
22 scoped_ptr<TimingFunction> timing_function); 22 scoped_ptr<TimingFunction> timing_function);
23 23
24 virtual ~ScrollOffsetAnimationCurve(); 24 virtual ~ScrollOffsetAnimationCurve();
25 25
26 void SetInitialValue(const gfx::ScrollOffset& initial_value); 26 void SetInitialValue(const gfx::ScrollOffset& initial_value);
27 gfx::ScrollOffset GetValue(double t) const; 27 gfx::ScrollOffset GetValue(double t) const;
28 gfx::ScrollOffset target_value() const { return target_value_; } 28 gfx::ScrollOffset target_value() const { return target_value_; }
29 void UpdateTarget(double t, const gfx::ScrollOffset& new_target); 29 void UpdateTarget(double t, const gfx::ScrollOffset& new_target);
30 30
31 // AnimationCurve implementation 31 // AnimationCurve implementation
32 virtual double Duration() const OVERRIDE; 32 virtual double Duration() const override;
33 virtual CurveType Type() const OVERRIDE; 33 virtual CurveType Type() const override;
34 virtual scoped_ptr<AnimationCurve> Clone() const OVERRIDE; 34 virtual scoped_ptr<AnimationCurve> Clone() const override;
35 35
36 private: 36 private:
37 ScrollOffsetAnimationCurve(const gfx::ScrollOffset& target_value, 37 ScrollOffsetAnimationCurve(const gfx::ScrollOffset& target_value,
38 scoped_ptr <TimingFunction> timing_function); 38 scoped_ptr <TimingFunction> timing_function);
39 39
40 gfx::ScrollOffset initial_value_; 40 gfx::ScrollOffset initial_value_;
41 gfx::ScrollOffset target_value_; 41 gfx::ScrollOffset target_value_;
42 base::TimeDelta total_animation_duration_; 42 base::TimeDelta total_animation_duration_;
43 43
44 // Time from animation start to most recent UpdateTarget. 44 // Time from animation start to most recent UpdateTarget.
45 base::TimeDelta last_retarget_; 45 base::TimeDelta last_retarget_;
46 46
47 scoped_ptr<TimingFunction> timing_function_; 47 scoped_ptr<TimingFunction> timing_function_;
48 48
49 DISALLOW_COPY_AND_ASSIGN(ScrollOffsetAnimationCurve); 49 DISALLOW_COPY_AND_ASSIGN(ScrollOffsetAnimationCurve);
50 }; 50 };
51 51
52 } // namespace cc 52 } // namespace cc
53 53
54 #endif // CC_ANIMATION_SCROLL_OFFSET_ANIMATION_CURVE_H_ 54 #endif // CC_ANIMATION_SCROLL_OFFSET_ANIMATION_CURVE_H_
OLDNEW
« no previous file with comments | « cc/animation/layer_animation_controller_unittest.cc ('k') | cc/animation/scrollbar_animation_controller_linear_fade.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698