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

Side by Side Diff: Source/core/animation/animatable/AnimatableDouble.h

Issue 630993005: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/animation (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Added cpp to list 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 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 17 matching lines...) Expand all
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef AnimatableDouble_h 31 #ifndef AnimatableDouble_h
32 #define AnimatableDouble_h 32 #define AnimatableDouble_h
33 33
34 #include "core/animation/animatable/AnimatableValue.h" 34 #include "core/animation/animatable/AnimatableValue.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 class AnimatableDouble FINAL : public AnimatableValue { 38 class AnimatableDouble final : public AnimatableValue {
39 public: 39 public:
40 virtual ~AnimatableDouble() { } 40 virtual ~AnimatableDouble() { }
41 41
42 enum Constraint { 42 enum Constraint {
43 Unconstrained, 43 Unconstrained,
44 InterpolationIsNonContinuousWithZero, 44 InterpolationIsNonContinuousWithZero,
45 }; 45 };
46 46
47 static PassRefPtrWillBeRawPtr<AnimatableDouble> create(double number, Constr aint constraint = Unconstrained) 47 static PassRefPtrWillBeRawPtr<AnimatableDouble> create(double number, Constr aint constraint = Unconstrained)
48 { 48 {
49 return adoptRefWillBeNoop(new AnimatableDouble(number, constraint)); 49 return adoptRefWillBeNoop(new AnimatableDouble(number, constraint));
50 } 50 }
51 51
52 double toDouble() const { return m_number; } 52 double toDouble() const { return m_number; }
53 53
54 virtual void trace(Visitor* visitor) OVERRIDE { AnimatableValue::trace(visit or); } 54 virtual void trace(Visitor* visitor) override { AnimatableValue::trace(visit or); }
55 55
56 protected: 56 protected:
57 virtual PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const Animatab leValue*, double fraction) const OVERRIDE; 57 virtual PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const Animatab leValue*, double fraction) const override;
58 virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const OVER RIDE; 58 virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const over ride;
59 59
60 private: 60 private:
61 AnimatableDouble(double number, Constraint constraint) 61 AnimatableDouble(double number, Constraint constraint)
62 : m_number(number) 62 : m_number(number)
63 , m_constraint(constraint) 63 , m_constraint(constraint)
64 { 64 {
65 } 65 }
66 virtual AnimatableType type() const OVERRIDE { return TypeDouble; } 66 virtual AnimatableType type() const override { return TypeDouble; }
67 virtual bool equalTo(const AnimatableValue*) const OVERRIDE; 67 virtual bool equalTo(const AnimatableValue*) const override;
68 virtual double distanceTo(const AnimatableValue*) const OVERRIDE; 68 virtual double distanceTo(const AnimatableValue*) const override;
69 69
70 double m_number; 70 double m_number;
71 Constraint m_constraint; 71 Constraint m_constraint;
72 }; 72 };
73 73
74 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableDouble, isDouble()); 74 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableDouble, isDouble());
75 75
76 } // namespace blink 76 } // namespace blink
77 77
78 #endif // AnimatableDouble_h 78 #endif // AnimatableDouble_h
OLDNEW
« no previous file with comments | « Source/core/animation/animatable/AnimatableColor.h ('k') | Source/core/animation/animatable/AnimatableFilterOperations.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698