| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 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 |
| 11 * copyright notice, this list of conditions and the following disclaimer | 11 * copyright notice, this list of conditions and the following disclaimer |
| 12 * in the documentation and/or other materials provided with the | 12 * in the documentation and/or other materials provided with the |
| 13 * distribution. | 13 * distribution. |
| 14 * * Neither the name of Google Inc. nor the names of its | 14 * * Neither the name of Google Inc. nor the names of its |
| 15 * contributors may be used to endorse or promote products derived from | 15 * contributors may be used to endorse or promote products derived from |
| 16 * this software without specific prior written permission. | 16 * this software without specific prior written permission. |
| 17 * | 17 * |
| 18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | 18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
| 19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | 19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
| 20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
| 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 AnimatableLengthPoint_h | 31 #ifndef AnimatableLengthPoint3D_h |
| 32 #define AnimatableLengthPoint_h | 32 #define AnimatableLengthPoint3D_h |
| 33 | 33 |
| 34 #include "core/animation/AnimatableValue.h" | 34 #include "core/animation/AnimatableValue.h" |
| 35 | 35 |
| 36 namespace WebCore { | 36 namespace WebCore { |
| 37 | 37 |
| 38 class AnimatableLengthPoint FINAL : public AnimatableValue { | 38 class AnimatableLengthPoint3D FINAL : public AnimatableValue { |
| 39 public: | 39 public: |
| 40 virtual ~AnimatableLengthPoint() { } | 40 virtual ~AnimatableLengthPoint3D() { } |
| 41 static PassRefPtrWillBeRawPtr<AnimatableLengthPoint> create(PassRefPtrWillBe
RawPtr<AnimatableValue> x, PassRefPtrWillBeRawPtr<AnimatableValue> y) | 41 static PassRefPtr<AnimatableLengthPoint3D> create(PassRefPtr<AnimatableValue
> x, PassRefPtr<AnimatableValue> y, PassRefPtr<AnimatableValue> z) |
| 42 { | 42 { |
| 43 return adoptRefWillBeNoop(new AnimatableLengthPoint(x, y)); | 43 return adoptRef(new AnimatableLengthPoint3D(x, y, z)); |
| 44 } | 44 } |
| 45 const AnimatableValue* x() const { return m_x.get(); } | 45 const AnimatableValue* x() const { return m_x.get(); } |
| 46 const AnimatableValue* y() const { return m_y.get(); } | 46 const AnimatableValue* y() const { return m_y.get(); } |
| 47 const AnimatableValue* z() const { return m_z.get(); } |
| 47 | 48 |
| 48 virtual void trace(Visitor*) OVERRIDE; | 49 virtual void trace(Visitor*) OVERRIDE; |
| 49 | 50 |
| 50 protected: | 51 protected: |
| 51 virtual PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const Animatab
leValue*, double fraction) const OVERRIDE; | 52 virtual PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, do
uble fraction) const OVERRIDE; |
| 52 virtual PassRefPtrWillBeRawPtr<AnimatableValue> addWith(const AnimatableValu
e*) const OVERRIDE; | 53 virtual PassRefPtr<AnimatableValue> addWith(const AnimatableValue*) const OV
ERRIDE; |
| 53 | 54 |
| 54 private: | 55 private: |
| 55 AnimatableLengthPoint(PassRefPtrWillBeRawPtr<AnimatableValue> x, PassRefPtrW
illBeRawPtr<AnimatableValue> y) | 56 AnimatableLengthPoint3D(PassRefPtr<AnimatableValue> x, PassRefPtr<Animatable
Value> y, PassRefPtr<AnimatableValue> z) |
| 56 : m_x(x) | 57 : m_x(x) |
| 57 , m_y(y) | 58 , m_y(y) |
| 59 , m_z(z) |
| 58 { | 60 { |
| 59 } | 61 } |
| 60 virtual AnimatableType type() const OVERRIDE { return TypeLengthPoint; } | 62 virtual AnimatableType type() const OVERRIDE { return TypeLengthPoint3D; } |
| 61 virtual bool equalTo(const AnimatableValue*) const OVERRIDE; | 63 virtual bool equalTo(const AnimatableValue*) const OVERRIDE; |
| 62 | 64 |
| 63 RefPtrWillBeMember<AnimatableValue> m_x; | 65 RefPtrWillBeMember<AnimatableValue> m_x; |
| 64 RefPtrWillBeMember<AnimatableValue> m_y; | 66 RefPtrWillBeMember<AnimatableValue> m_y; |
| 67 RefPtrWillBeMember<AnimatableValue> m_z; |
| 65 }; | 68 }; |
| 66 | 69 |
| 67 inline const AnimatableLengthPoint* toAnimatableLengthPoint(const AnimatableValu
e* value) | 70 inline const AnimatableLengthPoint3D* toAnimatableLengthPoint3D(const Animatable
Value* value) |
| 68 { | 71 { |
| 69 ASSERT_WITH_SECURITY_IMPLICATION(value && value->isLengthPoint()); | 72 ASSERT_WITH_SECURITY_IMPLICATION(value && value->isLengthPoint3D()); |
| 70 return static_cast<const AnimatableLengthPoint*>(value); | 73 return static_cast<const AnimatableLengthPoint3D*>(value); |
| 71 } | 74 } |
| 72 | 75 |
| 73 } // namespace WebCore | 76 } // namespace WebCore |
| 74 | 77 |
| 75 #endif // AnimatableLengthPoint_h | 78 #endif // AnimatableLengthPoint3D_h |
| OLD | NEW |