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 16 matching lines...) Expand all Loading... |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 #include "core/animation/InertEffect.h" | 32 #include "core/animation/InertEffect.h" |
33 #include "core/animation/Interpolation.h" | 33 #include "core/animation/Interpolation.h" |
34 | 34 |
35 namespace blink { | 35 namespace blink { |
36 | 36 |
37 PassRefPtrWillBeRawPtr<InertEffect> InertEffect::create(PassRefPtrWillBeRawPtr<E
ffectModel> effect, const Timing& timing, bool paused, double inheritedTime) | 37 InertEffect* InertEffect::create(EffectModel* effect, const Timing& timing, bool
paused, double inheritedTime) |
38 { | 38 { |
39 return adoptRefWillBeNoop(new InertEffect(effect, timing, paused, inheritedT
ime)); | 39 return new InertEffect(effect, timing, paused, inheritedTime); |
40 } | 40 } |
41 | 41 |
42 InertEffect::InertEffect(PassRefPtrWillBeRawPtr<EffectModel> model, const Timing
& timing, bool paused, double inheritedTime) | 42 InertEffect::InertEffect(EffectModel* model, const Timing& timing, bool paused,
double inheritedTime) |
43 : AnimationEffect(timing) | 43 : AnimationEffect(timing) |
44 , m_model(model) | 44 , m_model(model) |
45 , m_paused(paused) | 45 , m_paused(paused) |
46 , m_inheritedTime(inheritedTime) | 46 , m_inheritedTime(inheritedTime) |
47 { | 47 { |
48 } | 48 } |
49 | 49 |
50 void InertEffect::sample(OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<
Interpolation>>>& result) | 50 void InertEffect::sample(HeapVector<Member<Interpolation>>*& result) |
51 { | 51 { |
52 updateInheritedTime(m_inheritedTime, TimingUpdateOnDemand); | 52 updateInheritedTime(m_inheritedTime, TimingUpdateOnDemand); |
53 if (!isInEffect()) { | 53 if (!isInEffect()) { |
54 result.clear(); | 54 if (result) |
| 55 result->clear(); |
55 return; | 56 return; |
56 } | 57 } |
57 | 58 |
58 double iteration = currentIteration(); | 59 double iteration = currentIteration(); |
59 ASSERT(iteration >= 0); | 60 ASSERT(iteration >= 0); |
60 // FIXME: Handle iteration values which overflow int. | 61 // FIXME: Handle iteration values which overflow int. |
61 return m_model->sample(static_cast<int>(iteration), timeFraction(), iteratio
nDuration(), result); | 62 return m_model->sample(static_cast<int>(iteration), timeFraction(), iteratio
nDuration(), result); |
62 } | 63 } |
63 | 64 |
64 double InertEffect::calculateTimeToEffectChange(bool, double, double) const | 65 double InertEffect::calculateTimeToEffectChange(bool, double, double) const |
65 { | 66 { |
66 return std::numeric_limits<double>::infinity(); | 67 return std::numeric_limits<double>::infinity(); |
67 } | 68 } |
68 | 69 |
69 DEFINE_TRACE(InertEffect) | 70 DEFINE_TRACE(InertEffect) |
70 { | 71 { |
71 visitor->trace(m_model); | 72 visitor->trace(m_model); |
72 AnimationEffect::trace(visitor); | 73 AnimationEffect::trace(visitor); |
73 } | 74 } |
74 | 75 |
75 } // namespace blink | 76 } // namespace blink |
OLD | NEW |