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

Side by Side Diff: Source/core/animation/animatable/AnimatableLengthSize.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 AnimatableLengthSize_h 31 #ifndef AnimatableLengthSize_h
32 #define AnimatableLengthSize_h 32 #define AnimatableLengthSize_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 AnimatableLengthSize FINAL : public AnimatableValue { 38 class AnimatableLengthSize final : public AnimatableValue {
39 public: 39 public:
40 virtual ~AnimatableLengthSize() { } 40 virtual ~AnimatableLengthSize() { }
41 static PassRefPtrWillBeRawPtr<AnimatableLengthSize> create(PassRefPtrWillBeR awPtr<AnimatableValue> width, PassRefPtrWillBeRawPtr<AnimatableValue> height) 41 static PassRefPtrWillBeRawPtr<AnimatableLengthSize> create(PassRefPtrWillBeR awPtr<AnimatableValue> width, PassRefPtrWillBeRawPtr<AnimatableValue> height)
42 { 42 {
43 return adoptRefWillBeNoop(new AnimatableLengthSize(width, height)); 43 return adoptRefWillBeNoop(new AnimatableLengthSize(width, height));
44 } 44 }
45 const AnimatableValue* width() const { return m_width.get(); } 45 const AnimatableValue* width() const { return m_width.get(); }
46 const AnimatableValue* height() const { return m_height.get(); } 46 const AnimatableValue* height() const { return m_height.get(); }
47 47
48 virtual void trace(Visitor*) OVERRIDE; 48 virtual void trace(Visitor*) override;
49 49
50 protected: 50 protected:
51 virtual PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const Animatab leValue*, double fraction) const OVERRIDE; 51 virtual PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const Animatab leValue*, double fraction) const override;
52 52
53 private: 53 private:
54 AnimatableLengthSize(PassRefPtrWillBeRawPtr<AnimatableValue> width, PassRefP trWillBeRawPtr<AnimatableValue> height) 54 AnimatableLengthSize(PassRefPtrWillBeRawPtr<AnimatableValue> width, PassRefP trWillBeRawPtr<AnimatableValue> height)
55 : m_width(width) 55 : m_width(width)
56 , m_height(height) 56 , m_height(height)
57 { 57 {
58 } 58 }
59 virtual AnimatableType type() const OVERRIDE { return TypeLengthSize; } 59 virtual AnimatableType type() const override { return TypeLengthSize; }
60 virtual bool equalTo(const AnimatableValue*) const OVERRIDE; 60 virtual bool equalTo(const AnimatableValue*) const override;
61 61
62 RefPtrWillBeMember<AnimatableValue> m_width; 62 RefPtrWillBeMember<AnimatableValue> m_width;
63 RefPtrWillBeMember<AnimatableValue> m_height; 63 RefPtrWillBeMember<AnimatableValue> m_height;
64 }; 64 };
65 65
66 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableLengthSize, isLengthSize()); 66 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableLengthSize, isLengthSize());
67 67
68 } // namespace blink 68 } // namespace blink
69 69
70 #endif // AnimatableLengthSize_h 70 #endif // AnimatableLengthSize_h
OLDNEW
« no previous file with comments | « Source/core/animation/animatable/AnimatableLengthPoint3D.h ('k') | Source/core/animation/animatable/AnimatableNeutral.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698