OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2014 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 |
(...skipping 20 matching lines...) Expand all Loading... | |
31 #ifndef AnimatableLengthPoint3D_h | 31 #ifndef AnimatableLengthPoint3D_h |
32 #define AnimatableLengthPoint3D_h | 32 #define AnimatableLengthPoint3D_h |
33 | 33 |
34 #include "core/animation/animatable/AnimatableValue.h" | 34 #include "core/animation/animatable/AnimatableValue.h" |
35 | 35 |
36 namespace blink { | 36 namespace blink { |
37 | 37 |
38 class AnimatableLengthPoint3D final : public AnimatableValue { | 38 class AnimatableLengthPoint3D final : public AnimatableValue { |
39 public: | 39 public: |
40 virtual ~AnimatableLengthPoint3D() { } | 40 virtual ~AnimatableLengthPoint3D() { } |
41 static PassRefPtrWillBeRawPtr<AnimatableLengthPoint3D> create(PassRefPtrWill BeRawPtr<AnimatableValue> x, PassRefPtrWillBeRawPtr<AnimatableValue> y, PassRefP trWillBeRawPtr<AnimatableValue> z) | 41 static AnimatableLengthPoint3D* create(AnimatableValue* x, AnimatableValue* y, AnimatableValue* z) |
42 { | 42 { |
43 return adoptRefWillBeNoop(new AnimatableLengthPoint3D(x, y, z)); | 43 return 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(); } |
sof
2015/05/30 11:34:05
yet more redundant get()s
peria
2015/06/01 04:43:02
Done.
| |
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 const AnimatableValue* z() const { return m_z.get(); } |
48 | 48 |
49 DECLARE_VIRTUAL_TRACE(); | 49 DECLARE_VIRTUAL_TRACE(); |
50 | 50 |
51 protected: | 51 protected: |
52 virtual PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const Animatab leValue*, double fraction) const override; | 52 virtual AnimatableValue* interpolateTo(const AnimatableValue*, double fracti on) const override; |
53 | 53 |
54 private: | 54 private: |
55 AnimatableLengthPoint3D(PassRefPtrWillBeRawPtr<AnimatableValue> x, PassRefPt rWillBeRawPtr<AnimatableValue> y, PassRefPtrWillBeRawPtr<AnimatableValue> z) | 55 AnimatableLengthPoint3D(AnimatableValue* x, AnimatableValue* y, AnimatableVa lue* z) |
56 : m_x(x) | 56 : m_x(x) |
57 , m_y(y) | 57 , m_y(y) |
58 , m_z(z) | 58 , m_z(z) |
59 { | 59 { |
60 } | 60 } |
61 virtual AnimatableType type() const override { return TypeLengthPoint3D; } | 61 virtual AnimatableType type() const override { return TypeLengthPoint3D; } |
62 virtual bool equalTo(const AnimatableValue*) const override; | 62 virtual bool equalTo(const AnimatableValue*) const override; |
63 | 63 |
64 RefPtrWillBeMember<AnimatableValue> m_x; | 64 Member<AnimatableValue> m_x; |
65 RefPtrWillBeMember<AnimatableValue> m_y; | 65 Member<AnimatableValue> m_y; |
66 RefPtrWillBeMember<AnimatableValue> m_z; | 66 Member<AnimatableValue> m_z; |
67 }; | 67 }; |
68 | 68 |
69 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableLengthPoint3D, isLengthPoint3D()); | 69 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableLengthPoint3D, isLengthPoint3D()); |
70 | 70 |
71 } // namespace blink | 71 } // namespace blink |
72 | 72 |
73 #endif // AnimatableLengthPoint3D_h | 73 #endif // AnimatableLengthPoint3D_h |
OLD | NEW |