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

Side by Side Diff: third_party/WebKit/Source/core/animation/animatable/AnimatableUnknown.h

Issue 2382653006: Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue (Closed)
Patch Set: Make check-webkit-style happy Created 4 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 15 matching lines...) Expand all
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
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 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/CSSPrimitiveValue.h" 36 #include "core/css/CSSIdentifierValue.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 ~AnimatableUnknown() override {} 42 ~AnimatableUnknown() override {}
43 43
44 static PassRefPtr<AnimatableUnknown> create(CSSValue* value) { 44 static PassRefPtr<AnimatableUnknown> create(CSSValue* value) {
45 return adoptRef(new AnimatableUnknown(value)); 45 return adoptRef(new AnimatableUnknown(value));
46 } 46 }
47 static PassRefPtr<AnimatableUnknown> create(CSSValueID value) { 47 static PassRefPtr<AnimatableUnknown> create(CSSValueID value) {
48 return adoptRef( 48 return adoptRef(new AnimatableUnknown(CSSIdentifierValue::create(value)));
49 new AnimatableUnknown(CSSPrimitiveValue::createIdentifier(value)));
50 } 49 }
51 50
52 CSSValue* toCSSValue() const { return m_value; } 51 CSSValue* toCSSValue() const { return m_value; }
53 CSSValueID toCSSValueID() const { 52 CSSValueID toCSSValueID() const {
54 return toCSSPrimitiveValue(m_value.get())->getValueID(); 53 return toCSSIdentifierValue(m_value.get())->getValueID();
55 } 54 }
56 55
57 protected: 56 protected:
58 PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue* value, 57 PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue* value,
59 double fraction) const override { 58 double fraction) const override {
60 return defaultInterpolateTo(this, value, fraction); 59 return defaultInterpolateTo(this, value, fraction);
61 } 60 }
62 61
63 bool usesDefaultInterpolationWith(const AnimatableValue*) const override; 62 bool usesDefaultInterpolationWith(const AnimatableValue*) const override;
64 63
(...skipping 16 matching lines...) Expand all
81 80
82 inline bool AnimatableUnknown::usesDefaultInterpolationWith( 81 inline bool AnimatableUnknown::usesDefaultInterpolationWith(
83 const AnimatableValue* value) const { 82 const AnimatableValue* value) const {
84 const AnimatableUnknown& unknown = toAnimatableUnknown(*value); 83 const AnimatableUnknown& unknown = toAnimatableUnknown(*value);
85 return !m_value->equals(*unknown.m_value); 84 return !m_value->equals(*unknown.m_value);
86 } 85 }
87 86
88 } // namespace blink 87 } // namespace blink
89 88
90 #endif // AnimatableUnknown_h 89 #endif // AnimatableUnknown_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698