| 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 24 matching lines...) Expand all Loading... |
| 35 #include "core/animation/animatable/AnimatableValue.h" | 35 #include "core/animation/animatable/AnimatableValue.h" |
| 36 #include "core/css/CSSValue.h" | 36 #include "core/css/CSSValue.h" |
| 37 #include "core/css/CSSValuePool.h" | 37 #include "core/css/CSSValuePool.h" |
| 38 | 38 |
| 39 namespace blink { | 39 namespace blink { |
| 40 | 40 |
| 41 class AnimatableUnknown final : public AnimatableValue { | 41 class AnimatableUnknown final : public AnimatableValue { |
| 42 public: | 42 public: |
| 43 virtual ~AnimatableUnknown() { } | 43 virtual ~AnimatableUnknown() { } |
| 44 | 44 |
| 45 static PassRefPtrWillBeRawPtr<AnimatableUnknown> create(CSSPrimitiveValue va
lue) | 45 static PassRefPtrWillBeRawPtr<AnimatableUnknown> create(const CSSPrimitiveVa
lue& value) |
| 46 { | 46 { |
| 47 return adoptRefWillBeNoop(new AnimatableUnknown(value)); | 47 return adoptRefWillBeNoop(new AnimatableUnknown(value)); |
| 48 } | 48 } |
| 49 static PassRefPtrWillBeRawPtr<AnimatableUnknown> create(CSSValueID value) | 49 static PassRefPtrWillBeRawPtr<AnimatableUnknown> create(CSSValueID value) |
| 50 { | 50 { |
| 51 return adoptRefWillBeNoop(new AnimatableUnknown(cssValuePool().createIde
ntifierValue(value))); | 51 return adoptRefWillBeNoop(new AnimatableUnknown(cssValuePool().createIde
ntifierValue(value))); |
| 52 } | 52 } |
| 53 | 53 |
| 54 CSSPrimitiveValue toCSSValue() const { return toCSSPrimitiveValue(m_value);
} | 54 const CSSPrimitiveValue& toCSSValue() const { return toCSSPrimitiveValue(m_v
alue); } |
| 55 CSSValueID toCSSValueID() const { return toCSSPrimitiveValue(m_value).getVal
ueID(); } | 55 CSSValueID toCSSValueID() const { return toCSSPrimitiveValue(m_value).getVal
ueID(); } |
| 56 | 56 |
| 57 DEFINE_INLINE_VIRTUAL_TRACE() | 57 DEFINE_INLINE_VIRTUAL_TRACE() |
| 58 { | 58 { |
| 59 visitor->trace(m_value); | 59 visitor->trace(m_value); |
| 60 AnimatableValue::trace(visitor); | 60 AnimatableValue::trace(visitor); |
| 61 } | 61 } |
| 62 | 62 |
| 63 protected: | 63 protected: |
| 64 virtual PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const Animatab
leValue* value, double fraction) const override | 64 virtual PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const Animatab
leValue* value, double fraction) const override |
| 65 { | 65 { |
| 66 return defaultInterpolateTo(this, value, fraction); | 66 return defaultInterpolateTo(this, value, fraction); |
| 67 } | 67 } |
| 68 | 68 |
| 69 virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const over
ride { return true; } | 69 virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const over
ride { return true; } |
| 70 | 70 |
| 71 private: | 71 private: |
| 72 explicit AnimatableUnknown(CSSPrimitiveValue value) | 72 explicit AnimatableUnknown(const CSSPrimitiveValue& value) |
| 73 : m_value(value) | 73 : m_value(value) |
| 74 { | 74 { |
| 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 CSSValue m_value; | 79 const 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.ptrEquals(unknown->m_value) || m_value.equals(unknown->m_valu
e); | 87 return m_value.ptrEquals(unknown->m_value) || m_value.equals(unknown->m_valu
e); |
| 88 } | 88 } |
| 89 | 89 |
| 90 } // namespace blink | 90 } // namespace blink |
| 91 | 91 |
| 92 #endif // AnimatableUnknown_h | 92 #endif // AnimatableUnknown_h |
| OLD | NEW |