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

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

Issue 194673002: Web Animations: Refactor KeyframeEffectModel to work via an InterpolationEffect. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@interpolationWrap
Patch Set: Created 6 years, 9 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 12 matching lines...) Expand all
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
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/InertAnimation.h" 32 #include "core/animation/InertAnimation.h"
33 #include "core/animation/Interpolation.h"
33 34
34 namespace WebCore { 35 namespace WebCore {
35 36
36 PassRefPtr<InertAnimation> InertAnimation::create(PassRefPtrWillBeRawPtr<Animati onEffect> effect, const Timing& timing, bool paused) 37 PassRefPtr<InertAnimation> InertAnimation::create(PassRefPtrWillBeRawPtr<Animati onEffect> effect, const Timing& timing, bool paused)
37 { 38 {
38 return adoptRef(new InertAnimation(effect, timing, paused)); 39 return adoptRef(new InertAnimation(effect, timing, paused));
39 } 40 }
40 41
41 InertAnimation::InertAnimation(PassRefPtrWillBeRawPtr<AnimationEffect> effect, c onst Timing& timing, bool paused) 42 InertAnimation::InertAnimation(PassRefPtrWillBeRawPtr<AnimationEffect> effect, c onst Timing& timing, bool paused)
42 : TimedItem(timing) 43 : TimedItem(timing)
43 , m_effect(effect) 44 , m_effect(effect)
44 , m_paused(paused) 45 , m_paused(paused)
45 { 46 {
46 } 47 }
47 48
48 PassOwnPtr<AnimationEffect::CompositableValueList> InertAnimation::sample() 49 PassOwnPtr<Vector<RefPtr<Interpolation> > > InertAnimation::sample()
49 { 50 {
50 updateInheritedTime(0); 51 updateInheritedTime(0);
51 if (!isInEffect()) 52 if (!isInEffect())
52 return nullptr; 53 return nullptr;
53 54
54 double iteration = currentIteration(); 55 double iteration = currentIteration();
55 ASSERT(iteration >= 0); 56 ASSERT(iteration >= 0);
56 // FIXME: Handle iteration values which overflow int. 57 // FIXME: Handle iteration values which overflow int.
57 return m_effect->sample(static_cast<int>(iteration), timeFraction()); 58 return m_effect->sample(static_cast<int>(iteration), timeFraction());
58 } 59 }
59 60
60 61
61 double InertAnimation::calculateTimeToEffectChange(bool, double, double) const 62 double InertAnimation::calculateTimeToEffectChange(bool, double, double) const
62 { 63 {
63 return std::numeric_limits<double>::infinity(); 64 return std::numeric_limits<double>::infinity();
64 } 65 }
65 66
66 } // namespace WebCore 67 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698