| OLD | NEW |
| 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 Loading... |
| 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 { | 45 { |
| 46 return adoptRef(new AnimatableUnknown(value)); | 46 return adoptRef(new AnimatableUnknown(value)); |
| 47 } | 47 } |
| 48 static PassRefPtr<AnimatableUnknown> create(CSSValueID value) | 48 static PassRefPtr<AnimatableUnknown> create(CSSValueID value) |
| 49 { | 49 { |
| 50 return adoptRef(new AnimatableUnknown(CSSPrimitiveValue::createIdentifie
r(value))); | 50 return adoptRef(new AnimatableUnknown(CSSIdentifierValue::create(value))
); |
| 51 } | 51 } |
| 52 | 52 |
| 53 CSSValue* toCSSValue() const { return m_value; } | 53 CSSValue* toCSSValue() const { return m_value; } |
| 54 CSSValueID toCSSValueID() const { return toCSSPrimitiveValue(m_value.get())-
>getValueID(); } | 54 CSSValueID toCSSValueID() const { return toCSSIdentifierValue(m_value.get())
->getValueID(); } |
| 55 | 55 |
| 56 protected: | 56 protected: |
| 57 PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue* value, doub
le fraction) const override | 57 PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue* value, doub
le fraction) const override |
| 58 { | 58 { |
| 59 return defaultInterpolateTo(this, value, fraction); | 59 return defaultInterpolateTo(this, value, fraction); |
| 60 } | 60 } |
| 61 | 61 |
| 62 bool usesDefaultInterpolationWith(const AnimatableValue*) const override; | 62 bool usesDefaultInterpolationWith(const AnimatableValue*) const override; |
| 63 | 63 |
| 64 private: | 64 private: |
| (...skipping 18 matching lines...) Expand all Loading... |
| 83 | 83 |
| 84 inline bool AnimatableUnknown::usesDefaultInterpolationWith(const AnimatableValu
e* value) const | 84 inline bool AnimatableUnknown::usesDefaultInterpolationWith(const AnimatableValu
e* value) const |
| 85 { | 85 { |
| 86 const AnimatableUnknown& unknown = toAnimatableUnknown(*value); | 86 const AnimatableUnknown& unknown = toAnimatableUnknown(*value); |
| 87 return !m_value->equals(*unknown.m_value); | 87 return !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 |
| OLD | NEW |