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

Side by Side Diff: Source/core/animation/animatable/AnimatableUnknown.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 19 matching lines...) Expand all
30 30
31 #ifndef AnimatableUnknown_h 31 #ifndef AnimatableUnknown_h
32 #define AnimatableUnknown_h 32 #define AnimatableUnknown_h
33 33
34 #include "core/CSSValueKeywords.h" 34 #include "core/CSSValueKeywords.h"
35 #include "core/animation/animatable/AnimatableValue.h" 35 #include "core/animation/animatable/AnimatableValue.h"
36 #include "core/css/CSSValuePool.h" 36 #include "core/css/CSSValuePool.h"
37 37
38 namespace blink { 38 namespace blink {
39 39
40 class AnimatableUnknown FINAL : public AnimatableValue { 40 class AnimatableUnknown final : public AnimatableValue {
41 public: 41 public:
42 virtual ~AnimatableUnknown() { } 42 virtual ~AnimatableUnknown() { }
43 43
44 static PassRefPtrWillBeRawPtr<AnimatableUnknown> create(PassRefPtrWillBeRawP tr<CSSValue> value) 44 static PassRefPtrWillBeRawPtr<AnimatableUnknown> create(PassRefPtrWillBeRawP tr<CSSValue> value)
45 { 45 {
46 return adoptRefWillBeNoop(new AnimatableUnknown(value)); 46 return adoptRefWillBeNoop(new AnimatableUnknown(value));
47 } 47 }
48 static PassRefPtrWillBeRawPtr<AnimatableUnknown> create(CSSValueID value) 48 static PassRefPtrWillBeRawPtr<AnimatableUnknown> create(CSSValueID value)
49 { 49 {
50 return adoptRefWillBeNoop(new AnimatableUnknown(cssValuePool().createIde ntifierValue(value))); 50 return adoptRefWillBeNoop(new AnimatableUnknown(cssValuePool().createIde ntifierValue(value)));
51 } 51 }
52 52
53 PassRefPtrWillBeRawPtr<CSSValue> toCSSValue() const { return m_value; } 53 PassRefPtrWillBeRawPtr<CSSValue> toCSSValue() const { return m_value; }
54 CSSValueID toCSSValueID() const { return toCSSPrimitiveValue(m_value.get())- >getValueID(); } 54 CSSValueID toCSSValueID() const { return toCSSPrimitiveValue(m_value.get())- >getValueID(); }
55 55
56 virtual void trace(Visitor* visitor) OVERRIDE 56 virtual void trace(Visitor* visitor) override
57 { 57 {
58 visitor->trace(m_value); 58 visitor->trace(m_value);
59 AnimatableValue::trace(visitor); 59 AnimatableValue::trace(visitor);
60 } 60 }
61 61
62 protected: 62 protected:
63 virtual PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const Animatab leValue* value, double fraction) const OVERRIDE 63 virtual PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const Animatab leValue* value, double fraction) const override
64 { 64 {
65 return defaultInterpolateTo(this, value, fraction); 65 return defaultInterpolateTo(this, value, fraction);
66 } 66 }
67 67
68 virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const OVER RIDE { return true; } 68 virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const over ride { return true; }
69 69
70 private: 70 private:
71 explicit AnimatableUnknown(PassRefPtrWillBeRawPtr<CSSValue> value) 71 explicit AnimatableUnknown(PassRefPtrWillBeRawPtr<CSSValue> value)
72 : m_value(value) 72 : m_value(value)
73 { 73 {
74 ASSERT(m_value); 74 ASSERT(m_value);
75 } 75 }
76 virtual AnimatableType type() const OVERRIDE { return TypeUnknown; } 76 virtual AnimatableType type() const override { return TypeUnknown; }
77 virtual bool equalTo(const AnimatableValue*) const OVERRIDE; 77 virtual bool equalTo(const AnimatableValue*) const override;
78 78
79 const RefPtrWillBeMember<CSSValue> m_value; 79 const RefPtrWillBeMember<CSSValue> m_value;
80 }; 80 };
81 81
82 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableUnknown, isUnknown()); 82 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableUnknown, isUnknown());
83 83
84 inline bool AnimatableUnknown::equalTo(const AnimatableValue* value) const 84 inline bool AnimatableUnknown::equalTo(const AnimatableValue* value) const
85 { 85 {
86 const AnimatableUnknown* unknown = toAnimatableUnknown(value); 86 const AnimatableUnknown* unknown = toAnimatableUnknown(value);
87 return m_value == unknown->m_value || m_value->equals(*unknown->m_value); 87 return m_value == unknown->m_value || m_value->equals(*unknown->m_value);
88 } 88 }
89 89
90 } // namespace blink 90 } // namespace blink
91 91
92 #endif // AnimatableUnknown_h 92 #endif // AnimatableUnknown_h
OLDNEW
« no previous file with comments | « Source/core/animation/animatable/AnimatableTransform.h ('k') | Source/core/animation/animatable/AnimatableValueKeyframe.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698