| 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 10 matching lines...) Expand all Loading... |
| 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
| 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 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 AnimatableTransform_h | 31 #ifndef AnimatableDouble_h |
| 32 #define AnimatableTransform_h | 32 #define AnimatableDouble_h |
| 33 | 33 |
| 34 #include "core/animation/AnimatableValue.h" | 34 #include "core/animation/AnimatableValue.h" |
| 35 #include "core/platform/graphics/transforms/TransformOperations.h" | 35 #include "core/css/CSSValue.h" |
| 36 | 36 |
| 37 namespace WebCore { | 37 namespace WebCore { |
| 38 | 38 |
| 39 class AnimatableTransform : public AnimatableValue { | 39 class AnimatableDouble : public AnimatableValue { |
| 40 public: | 40 public: |
| 41 virtual ~AnimatableTransform() { } | 41 virtual ~AnimatableDouble() { } |
| 42 static PassRefPtr<AnimatableTransform> create(const TransformOperations&); | 42 |
| 43 const TransformOperations& transformOperations() const | 43 static PassRefPtr<AnimatableDouble> create(double number) |
| 44 { | 44 { |
| 45 return m_transform; | 45 return adoptRef(new AnimatableDouble(number)); |
| 46 } | 46 } |
| 47 | 47 |
| 48 PassRefPtr<CSSValue> toCSSValue() const; |
| 49 double toDouble() const { return m_number; } |
| 50 |
| 48 protected: | 51 protected: |
| 49 virtual PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, do
uble fraction) const OVERRIDE; | 52 virtual PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, do
uble fraction) const OVERRIDE; |
| 50 virtual PassRefPtr<AnimatableValue> addWith(const AnimatableValue*) const OV
ERRIDE; | 53 virtual PassRefPtr<AnimatableValue> addWith(const AnimatableValue*) const OV
ERRIDE; |
| 51 | 54 |
| 52 private: | 55 private: |
| 53 explicit AnimatableTransform(const TransformOperations& transform) | 56 AnimatableDouble(double number) |
| 54 : m_transform(transform) | 57 : m_number(number) |
| 55 { | 58 { |
| 56 } | 59 } |
| 57 virtual AnimatableType type() const OVERRIDE { return TypeTransform; } | 60 virtual AnimatableType type() const OVERRIDE { return TypeDouble; } |
| 58 const TransformOperations m_transform; | 61 |
| 62 double m_number; |
| 59 }; | 63 }; |
| 60 | 64 |
| 61 inline const AnimatableTransform* toAnimatableTransform(const AnimatableValue* v
alue) | 65 inline const AnimatableDouble* toAnimatableDouble(const AnimatableValue* value) |
| 62 { | 66 { |
| 63 ASSERT_WITH_SECURITY_IMPLICATION(value && value->isTransform()); | 67 ASSERT_WITH_SECURITY_IMPLICATION(value && value->isDouble()); |
| 64 return static_cast<const AnimatableTransform*>(value); | 68 return static_cast<const AnimatableDouble*>(value); |
| 65 } | 69 } |
| 66 | 70 |
| 67 } // namespace WebCore | 71 } // namespace WebCore |
| 68 | 72 |
| 69 #endif // AnimatableTransform_h | 73 #endif // AnimatableDouble_h |
| 70 | |
| OLD | NEW |