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

Side by Side Diff: cc/animation/timing_function.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 #ifndef CC_ANIMATION_TIMING_FUNCTION_H_ 5 #ifndef CC_ANIMATION_TIMING_FUNCTION_H_
6 #define CC_ANIMATION_TIMING_FUNCTION_H_ 6 #define CC_ANIMATION_TIMING_FUNCTION_H_
7 7
8 #include "cc/base/cc_export.h" 8 #include "cc/base/cc_export.h"
9 #include "ui/gfx/geometry/cubic_bezier.h" 9 #include "ui/gfx/geometry/cubic_bezier.h"
10 10
(...skipping 17 matching lines...) Expand all
28 DISALLOW_ASSIGN(TimingFunction); 28 DISALLOW_ASSIGN(TimingFunction);
29 }; 29 };
30 30
31 class CC_EXPORT CubicBezierTimingFunction : public TimingFunction { 31 class CC_EXPORT CubicBezierTimingFunction : public TimingFunction {
32 public: 32 public:
33 static scoped_ptr<CubicBezierTimingFunction> Create(double x1, double y1, 33 static scoped_ptr<CubicBezierTimingFunction> Create(double x1, double y1,
34 double x2, double y2); 34 double x2, double y2);
35 virtual ~CubicBezierTimingFunction(); 35 virtual ~CubicBezierTimingFunction();
36 36
37 // TimingFunction implementation. 37 // TimingFunction implementation.
38 virtual float GetValue(double time) const OVERRIDE; 38 virtual float GetValue(double time) const override;
39 virtual float Velocity(double time) const OVERRIDE; 39 virtual float Velocity(double time) const override;
40 virtual void Range(float* min, float* max) const OVERRIDE; 40 virtual void Range(float* min, float* max) const override;
41 virtual scoped_ptr<TimingFunction> Clone() const OVERRIDE; 41 virtual scoped_ptr<TimingFunction> Clone() const override;
42 42
43 protected: 43 protected:
44 CubicBezierTimingFunction(double x1, double y1, double x2, double y2); 44 CubicBezierTimingFunction(double x1, double y1, double x2, double y2);
45 45
46 gfx::CubicBezier bezier_; 46 gfx::CubicBezier bezier_;
47 47
48 private: 48 private:
49 DISALLOW_ASSIGN(CubicBezierTimingFunction); 49 DISALLOW_ASSIGN(CubicBezierTimingFunction);
50 }; 50 };
51 51
(...skipping 25 matching lines...) Expand all
77 public: 77 public:
78 static scoped_ptr<TimingFunction> Create(); 78 static scoped_ptr<TimingFunction> Create();
79 79
80 private: 80 private:
81 DISALLOW_IMPLICIT_CONSTRUCTORS(EaseInOutTimingFunction); 81 DISALLOW_IMPLICIT_CONSTRUCTORS(EaseInOutTimingFunction);
82 }; 82 };
83 83
84 } // namespace cc 84 } // namespace cc
85 85
86 #endif // CC_ANIMATION_TIMING_FUNCTION_H_ 86 #endif // CC_ANIMATION_TIMING_FUNCTION_H_
OLDNEW
« no previous file with comments | « cc/animation/scrollbar_animation_controller_thinning_unittest.cc ('k') | cc/base/delayed_unique_notifier_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698