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 23 matching lines...) Expand all Loading... |
34 #include "CSSValueKeywords.h" | 34 #include "CSSValueKeywords.h" |
35 #include "core/animation/AnimatableValue.h" | 35 #include "core/animation/AnimatableValue.h" |
36 #include "core/css/CSSValuePool.h" | 36 #include "core/css/CSSValuePool.h" |
37 | 37 |
38 namespace WebCore { | 38 namespace WebCore { |
39 | 39 |
40 class AnimatableUnknown FINAL : public AnimatableValue { | 40 class AnimatableUnknown FINAL : public AnimatableValue { |
41 public: | 41 public: |
42 virtual ~AnimatableUnknown() { } | 42 virtual ~AnimatableUnknown() { } |
43 | 43 |
44 static PassRefPtr<AnimatableUnknown> create(PassRefPtrWillBeRawPtr<CSSValue>
value) | 44 static PassRefPtrWillBeRawPtr<AnimatableUnknown> create(PassRefPtrWillBeRawP
tr<CSSValue> value) |
45 { | 45 { |
46 return adoptRef(new AnimatableUnknown(value)); | 46 return adoptRefWillBeNoop(new AnimatableUnknown(value)); |
47 } | 47 } |
48 static PassRefPtr<AnimatableUnknown> create(CSSValueID value) | 48 static PassRefPtrWillBeRawPtr<AnimatableUnknown> create(CSSValueID value) |
49 { | 49 { |
50 return adoptRef(new AnimatableUnknown(cssValuePool().createIdentifierVal
ue(value))); | 50 return adoptRefWillBeNoop(new AnimatableUnknown(cssValuePool().createIde
ntifierValue(value))); |
51 } | 51 } |
52 | 52 |
53 PassRefPtrWillBeRawPtr<CSSValue> toCSSValue() const { return m_value; } | 53 PassRefPtrWillBeRawPtr<CSSValue> toCSSValue() const { return m_value; } |
54 CSSValueID toCSSValueID() const { return toCSSPrimitiveValue(m_value.get())-
>getValueID(); } | 54 CSSValueID toCSSValueID() const { return toCSSPrimitiveValue(m_value.get())-
>getValueID(); } |
55 | 55 |
| 56 virtual void trace(Visitor* visitor) OVERRIDE |
| 57 { |
| 58 visitor->trace(m_value); |
| 59 } |
| 60 |
56 protected: | 61 protected: |
57 virtual PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue* val
ue, double fraction) const OVERRIDE | 62 virtual PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const Animatab
leValue* value, double fraction) const OVERRIDE |
58 { | 63 { |
59 return defaultInterpolateTo(this, value, fraction); | 64 return defaultInterpolateTo(this, value, fraction); |
60 } | 65 } |
61 | 66 |
62 virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const OVER
RIDE { return true; } | 67 virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const OVER
RIDE { return true; } |
63 | 68 |
64 private: | 69 private: |
65 explicit AnimatableUnknown(PassRefPtrWillBeRawPtr<CSSValue> value) | 70 explicit AnimatableUnknown(PassRefPtrWillBeRawPtr<CSSValue> value) |
66 : m_value(value) | 71 : m_value(value) |
67 { | 72 { |
68 ASSERT(m_value); | 73 ASSERT(m_value); |
69 } | 74 } |
70 virtual AnimatableType type() const OVERRIDE { return TypeUnknown; } | 75 virtual AnimatableType type() const OVERRIDE { return TypeUnknown; } |
71 virtual bool equalTo(const AnimatableValue*) const OVERRIDE; | 76 virtual bool equalTo(const AnimatableValue*) const OVERRIDE; |
72 | 77 |
73 const RefPtrWillBePersistent<CSSValue> m_value; | 78 const RefPtrWillBeMember<CSSValue> m_value; |
74 }; | 79 }; |
75 | 80 |
76 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableUnknown, isUnknown()); | 81 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableUnknown, isUnknown()); |
77 | 82 |
78 inline bool AnimatableUnknown::equalTo(const AnimatableValue* value) const | 83 inline bool AnimatableUnknown::equalTo(const AnimatableValue* value) const |
79 { | 84 { |
80 const AnimatableUnknown* unknown = toAnimatableUnknown(value); | 85 const AnimatableUnknown* unknown = toAnimatableUnknown(value); |
81 return m_value == unknown->m_value || m_value->equals(*unknown->m_value); | 86 return m_value == unknown->m_value || m_value->equals(*unknown->m_value); |
82 } | 87 } |
83 | 88 |
84 } // namespace WebCore | 89 } // namespace WebCore |
85 | 90 |
86 #endif // AnimatableUnknown_h | 91 #endif // AnimatableUnknown_h |
OLD | NEW |