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 AnimatableLengthSize_h | 31 #ifndef AnimatableLengthSize_h |
32 #define AnimatableLengthSize_h | 32 #define AnimatableLengthSize_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 AnimatableLengthSize FINAL : public AnimatableValue { | 38 class AnimatableLengthSize FINAL : public AnimatableValue { |
39 public: | 39 public: |
40 virtual ~AnimatableLengthSize() { } | 40 virtual ~AnimatableLengthSize() { } |
41 static PassRefPtr<AnimatableLengthSize> create(PassRefPtr<AnimatableValue> w
idth, PassRefPtr<AnimatableValue> height) | 41 static PassRefPtrWillBeRawPtr<AnimatableLengthSize> create(PassRefPtrWillBeR
awPtr<AnimatableValue> width, PassRefPtrWillBeRawPtr<AnimatableValue> height) |
42 { | 42 { |
43 return adoptRef(new AnimatableLengthSize(width, height)); | 43 return adoptRefWillBeNoop(new AnimatableLengthSize(width, height)); |
44 } | 44 } |
45 const AnimatableValue* width() const { return m_width.get(); } | 45 const AnimatableValue* width() const { return m_width.get(); } |
46 const AnimatableValue* height() const { return m_height.get(); } | 46 const AnimatableValue* height() const { return m_height.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 AnimatableLengthSize(PassRefPtr<AnimatableValue> width, PassRefPtr<Animatabl
eValue> height) | 55 AnimatableLengthSize(PassRefPtrWillBeRawPtr<AnimatableValue> width, PassRefP
trWillBeRawPtr<AnimatableValue> height) |
54 : m_width(width) | 56 : m_width(width) |
55 , m_height(height) | 57 , m_height(height) |
56 { | 58 { |
57 } | 59 } |
58 virtual AnimatableType type() const OVERRIDE { return TypeLengthSize; } | 60 virtual AnimatableType type() const OVERRIDE { return TypeLengthSize; } |
59 virtual bool equalTo(const AnimatableValue*) const OVERRIDE; | 61 virtual bool equalTo(const AnimatableValue*) const OVERRIDE; |
60 | 62 |
61 RefPtr<AnimatableValue> m_width; | 63 RefPtrWillBeMember<AnimatableValue> m_width; |
62 RefPtr<AnimatableValue> m_height; | 64 RefPtrWillBeMember<AnimatableValue> m_height; |
63 }; | 65 }; |
64 | 66 |
65 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableLengthSize, isLengthSize()); | 67 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableLengthSize, isLengthSize()); |
66 | 68 |
67 } // namespace WebCore | 69 } // namespace WebCore |
68 | 70 |
69 #endif // AnimatableLengthSize_h | 71 #endif // AnimatableLengthSize_h |
OLD | NEW |