| 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 20 matching lines...) Expand all Loading... |
| 31 #ifndef AnimatableLengthPoint_h | 31 #ifndef AnimatableLengthPoint_h |
| 32 #define AnimatableLengthPoint_h | 32 #define AnimatableLengthPoint_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 AnimatableLengthPoint FINAL : public AnimatableValue { |
| 39 public: | 39 public: |
| 40 virtual ~AnimatableLengthPoint() { } | 40 virtual ~AnimatableLengthPoint() { } |
| 41 static PassRefPtr<AnimatableLengthPoint> create(PassRefPtr<AnimatableValue>
x, PassRefPtr<AnimatableValue> y) | 41 static PassRefPtrWillBeRawPtr<AnimatableLengthPoint> create(PassRefPtrWillBe
RawPtr<AnimatableValue> x, PassRefPtrWillBeRawPtr<AnimatableValue> y) |
| 42 { | 42 { |
| 43 return adoptRef(new AnimatableLengthPoint(x, y)); | 43 return adoptRefWillBeNoop(new AnimatableLengthPoint(x, y)); |
| 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 | 47 |
| 48 virtual void trace(Visitor*) OVERRIDE; |
| 49 |
| 48 protected: | 50 protected: |
| 49 virtual PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, do
uble fraction) const OVERRIDE; | 51 virtual PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const Animatab
leValue*, double fraction) const OVERRIDE; |
| 50 virtual PassRefPtr<AnimatableValue> addWith(const AnimatableValue*) const OV
ERRIDE; | 52 virtual PassRefPtrWillBeRawPtr<AnimatableValue> addWith(const AnimatableValu
e*) const OVERRIDE; |
| 51 | 53 |
| 52 private: | 54 private: |
| 53 AnimatableLengthPoint(PassRefPtr<AnimatableValue> x, PassRefPtr<AnimatableVa
lue> y) | 55 AnimatableLengthPoint(PassRefPtrWillBeRawPtr<AnimatableValue> x, PassRefPtrW
illBeRawPtr<AnimatableValue> y) |
| 54 : m_x(x) | 56 : m_x(x) |
| 55 , m_y(y) | 57 , m_y(y) |
| 56 { | 58 { |
| 57 } | 59 } |
| 58 virtual AnimatableType type() const OVERRIDE { return TypeLengthPoint; } | 60 virtual AnimatableType type() const OVERRIDE { return TypeLengthPoint; } |
| 59 virtual bool equalTo(const AnimatableValue*) const OVERRIDE; | 61 virtual bool equalTo(const AnimatableValue*) const OVERRIDE; |
| 60 | 62 |
| 61 RefPtr<AnimatableValue> m_x; | 63 RefPtrWillBeMember<AnimatableValue> m_x; |
| 62 RefPtr<AnimatableValue> m_y; | 64 RefPtrWillBeMember<AnimatableValue> m_y; |
| 63 }; | 65 }; |
| 64 | 66 |
| 65 inline const AnimatableLengthPoint* toAnimatableLengthPoint(const AnimatableValu
e* value) | 67 inline const AnimatableLengthPoint* toAnimatableLengthPoint(const AnimatableValu
e* value) |
| 66 { | 68 { |
| 67 ASSERT_WITH_SECURITY_IMPLICATION(value && value->isLengthPoint()); | 69 ASSERT_WITH_SECURITY_IMPLICATION(value && value->isLengthPoint()); |
| 68 return static_cast<const AnimatableLengthPoint*>(value); | 70 return static_cast<const AnimatableLengthPoint*>(value); |
| 69 } | 71 } |
| 70 | 72 |
| 71 } // namespace WebCore | 73 } // namespace WebCore |
| 72 | 74 |
| 73 #endif // AnimatableLengthPoint_h | 75 #endif // AnimatableLengthPoint_h |
| OLD | NEW |