Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Side by Side Diff: Source/core/animation/InertEffect.cpp

Issue 1120003002: [Oilpan] Migrate most classes under core/animations to Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 17 matching lines...) Expand all
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 33
34 #include "core/animation/Interpolation.h" 34 #include "core/animation/Interpolation.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 PassRefPtrWillBeRawPtr<InertEffect> InertEffect::create(PassRefPtrWillBeRawPtr<E ffectModel> effect, const Timing& timing, bool paused, double inheritedTime) 38 InertEffect* InertEffect::create(EffectModel* effect, const Timing& timing, bool paused, double inheritedTime)
39 { 39 {
40 return adoptRefWillBeNoop(new InertEffect(effect, timing, paused, inheritedT ime)); 40 return new InertEffect(effect, timing, paused, inheritedTime);
41 } 41 }
42 42
43 InertEffect::InertEffect(PassRefPtrWillBeRawPtr<EffectModel> model, const Timing & timing, bool paused, double inheritedTime) 43 InertEffect::InertEffect(EffectModel* model, const Timing& timing, bool paused, double inheritedTime)
44 : AnimationEffect(timing) 44 : AnimationEffect(timing)
45 , m_model(model) 45 , m_model(model)
46 , m_paused(paused) 46 , m_paused(paused)
47 , m_inheritedTime(inheritedTime) 47 , m_inheritedTime(inheritedTime)
48 { 48 {
49 } 49 }
50 50
51 void InertEffect::sample(OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember< Interpolation>>>& result) 51 void InertEffect::sample(HeapVector<Member<Interpolation>>*& result)
52 { 52 {
53 updateInheritedTime(m_inheritedTime, TimingUpdateOnDemand); 53 updateInheritedTime(m_inheritedTime, TimingUpdateOnDemand);
54 if (!isInEffect()) { 54 if (!isInEffect()) {
55 result.clear(); 55 if (result)
56 result->clear();
56 return; 57 return;
57 } 58 }
58 59
59 double iteration = currentIteration(); 60 double iteration = currentIteration();
60 ASSERT(iteration >= 0); 61 ASSERT(iteration >= 0);
61 // FIXME: Handle iteration values which overflow int. 62 // FIXME: Handle iteration values which overflow int.
62 return m_model->sample(static_cast<int>(iteration), timeFraction(), iteratio nDuration(), result); 63 return m_model->sample(static_cast<int>(iteration), timeFraction(), iteratio nDuration(), result);
63 } 64 }
64 65
65 double InertEffect::calculateTimeToEffectChange(bool, double, double) const 66 double InertEffect::calculateTimeToEffectChange(bool, double, double) const
66 { 67 {
67 return std::numeric_limits<double>::infinity(); 68 return std::numeric_limits<double>::infinity();
68 } 69 }
69 70
70 DEFINE_TRACE(InertEffect) 71 DEFINE_TRACE(InertEffect)
71 { 72 {
72 visitor->trace(m_model); 73 visitor->trace(m_model);
73 AnimationEffect::trace(visitor); 74 AnimationEffect::trace(visitor);
74 } 75 }
75 76
76 } // namespace blink 77 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/animation/InertEffect.h ('k') | Source/core/animation/IntegerOptionalIntegerSVGInterpolation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698