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 #include "wtf/MathExtras.h" | |
Timothy Loh
2013/09/30 23:27:59
Is this used here?
alancutter (OOO until 2018)
2013/10/01 09:32:24
Removed.
| |
36 | 37 |
37 namespace WebCore { | 38 namespace WebCore { |
38 | 39 |
39 class AnimatableTransform : public AnimatableValue { | 40 class AnimatableDouble : public AnimatableValue { |
40 public: | 41 public: |
41 virtual ~AnimatableTransform() { } | 42 virtual ~AnimatableDouble() { } |
42 static PassRefPtr<AnimatableTransform> create(const TransformOperations&); | 43 |
43 const TransformOperations& transformOperations() const | 44 static PassRefPtr<AnimatableDouble> create(double number) |
44 { | 45 { |
45 return m_transform; | 46 return adoptRef(new AnimatableDouble(number)); |
46 } | 47 } |
47 | 48 |
49 PassRefPtr<CSSValue> toCSSValue() const; | |
50 double toDouble() const { return m_number; } | |
51 | |
48 protected: | 52 protected: |
49 virtual PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, do uble fraction) const OVERRIDE; | 53 virtual PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, do uble fraction) const OVERRIDE; |
50 virtual PassRefPtr<AnimatableValue> addWith(const AnimatableValue*) const OV ERRIDE; | 54 virtual PassRefPtr<AnimatableValue> addWith(const AnimatableValue*) const OV ERRIDE; |
51 | 55 |
52 private: | 56 private: |
53 explicit AnimatableTransform(const TransformOperations& transform) | 57 AnimatableDouble(double number) |
54 : m_transform(transform) | 58 : m_number(number) |
55 { | 59 { |
56 } | 60 } |
57 virtual AnimatableType type() const OVERRIDE { return TypeTransform; } | 61 virtual AnimatableType type() const OVERRIDE { return TypeDouble; } |
58 const TransformOperations m_transform; | 62 |
63 double m_number; | |
59 }; | 64 }; |
60 | 65 |
61 inline const AnimatableTransform* toAnimatableTransform(const AnimatableValue* v alue) | 66 inline const AnimatableDouble* toAnimatableDouble(const AnimatableValue* value) |
62 { | 67 { |
63 ASSERT_WITH_SECURITY_IMPLICATION(value && value->isTransform()); | 68 ASSERT_WITH_SECURITY_IMPLICATION(value && value->isDouble()); |
64 return static_cast<const AnimatableTransform*>(value); | 69 return static_cast<const AnimatableDouble*>(value); |
65 } | 70 } |
66 | 71 |
67 } // namespace WebCore | 72 } // namespace WebCore |
68 | 73 |
69 #endif // AnimatableTransform_h | 74 #endif // AnimatableDouble_h |
70 | |
OLD | NEW |