| Index: Source/core/animation/AnimatableLengthPoint3D.h
|
| diff --git a/Source/core/animation/AnimatableLengthPoint.h b/Source/core/animation/AnimatableLengthPoint3D.h
|
| similarity index 71%
|
| copy from Source/core/animation/AnimatableLengthPoint.h
|
| copy to Source/core/animation/AnimatableLengthPoint3D.h
|
| index 5728046189baef693272f3ab012caeb352761b98..10168860892848d9d5e4f1db061b653254520c20 100644
|
| --- a/Source/core/animation/AnimatableLengthPoint.h
|
| +++ b/Source/core/animation/AnimatableLengthPoint3D.h
|
| @@ -1,5 +1,5 @@
|
| /*
|
| - * Copyright (C) 2013 Google Inc. All rights reserved.
|
| + * Copyright (C) 2014 Google Inc. All rights reserved.
|
| *
|
| * Redistribution and use in source and binary forms, with or without
|
| * modification, are permitted provided that the following conditions are
|
| @@ -28,46 +28,49 @@
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#ifndef AnimatableLengthPoint_h
|
| -#define AnimatableLengthPoint_h
|
| +#ifndef AnimatableLengthPoint3D_h
|
| +#define AnimatableLengthPoint3D_h
|
|
|
| #include "core/animation/AnimatableValue.h"
|
|
|
| namespace WebCore {
|
|
|
| -class AnimatableLengthPoint FINAL : public AnimatableValue {
|
| +class AnimatableLengthPoint3D FINAL : public AnimatableValue {
|
| public:
|
| - virtual ~AnimatableLengthPoint() { }
|
| - static PassRefPtr<AnimatableLengthPoint> create(PassRefPtr<AnimatableValue> x, PassRefPtr<AnimatableValue> y)
|
| + virtual ~AnimatableLengthPoint3D() { }
|
| + static PassRefPtr<AnimatableLengthPoint3D> create(PassRefPtr<AnimatableValue> x, PassRefPtr<AnimatableValue> y, PassRefPtr<AnimatableValue> z)
|
| {
|
| - return adoptRef(new AnimatableLengthPoint(x, y));
|
| + return adoptRef(new AnimatableLengthPoint3D(x, y, z));
|
| }
|
| const AnimatableValue* x() const { return m_x.get(); }
|
| const AnimatableValue* y() const { return m_y.get(); }
|
| + const AnimatableValue* z() const { return m_z.get(); }
|
|
|
| protected:
|
| virtual PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, double fraction) const OVERRIDE;
|
| virtual PassRefPtr<AnimatableValue> addWith(const AnimatableValue*) const OVERRIDE;
|
|
|
| private:
|
| - AnimatableLengthPoint(PassRefPtr<AnimatableValue> x, PassRefPtr<AnimatableValue> y)
|
| + AnimatableLengthPoint3D(PassRefPtr<AnimatableValue> x, PassRefPtr<AnimatableValue> y, PassRefPtr<AnimatableValue> z)
|
| : m_x(x)
|
| , m_y(y)
|
| + , m_z(z)
|
| {
|
| }
|
| - virtual AnimatableType type() const OVERRIDE { return TypeLengthPoint; }
|
| + virtual AnimatableType type() const OVERRIDE { return TypeLengthPoint3D; }
|
| virtual bool equalTo(const AnimatableValue*) const OVERRIDE;
|
|
|
| RefPtr<AnimatableValue> m_x;
|
| RefPtr<AnimatableValue> m_y;
|
| + RefPtr<AnimatableValue> m_z;
|
| };
|
|
|
| -inline const AnimatableLengthPoint* toAnimatableLengthPoint(const AnimatableValue* value)
|
| +inline const AnimatableLengthPoint3D* toAnimatableLengthPoint3D(const AnimatableValue* value)
|
| {
|
| - ASSERT_WITH_SECURITY_IMPLICATION(value && value->isLengthPoint());
|
| - return static_cast<const AnimatableLengthPoint*>(value);
|
| + ASSERT_WITH_SECURITY_IMPLICATION(value && value->isLengthPoint3D());
|
| + return static_cast<const AnimatableLengthPoint3D*>(value);
|
| }
|
|
|
| } // namespace WebCore
|
|
|
| -#endif // AnimatableLengthPoint_h
|
| +#endif // AnimatableLengthPoint3D_h
|
|
|