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

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

Issue 293893003: Web Animations: Rename TimedItem to AnimationSource (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Update expectations. Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/animation/InertAnimation.h ('k') | Source/core/animation/Keyframe.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 22 matching lines...) Expand all
33 #include "core/animation/Interpolation.h" 33 #include "core/animation/Interpolation.h"
34 34
35 namespace WebCore { 35 namespace WebCore {
36 36
37 PassRefPtrWillBeRawPtr<InertAnimation> InertAnimation::create(PassRefPtrWillBeRa wPtr<AnimationEffect> effect, const Timing& timing, bool paused) 37 PassRefPtrWillBeRawPtr<InertAnimation> InertAnimation::create(PassRefPtrWillBeRa wPtr<AnimationEffect> effect, const Timing& timing, bool paused)
38 { 38 {
39 return adoptRefWillBeNoop(new InertAnimation(effect, timing, paused)); 39 return adoptRefWillBeNoop(new InertAnimation(effect, timing, paused));
40 } 40 }
41 41
42 InertAnimation::InertAnimation(PassRefPtrWillBeRawPtr<AnimationEffect> effect, c onst Timing& timing, bool paused) 42 InertAnimation::InertAnimation(PassRefPtrWillBeRawPtr<AnimationEffect> effect, c onst Timing& timing, bool paused)
43 : TimedItem(timing) 43 : AnimationSource(timing)
44 , m_effect(effect) 44 , m_effect(effect)
45 , m_paused(paused) 45 , m_paused(paused)
46 { 46 {
47 } 47 }
48 48
49 PassOwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation> > > In ertAnimation::sample(double inheritedTime) 49 PassOwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation> > > In ertAnimation::sample(double inheritedTime)
50 { 50 {
51 updateInheritedTime(inheritedTime, TimingUpdateOnDemand); 51 updateInheritedTime(inheritedTime, TimingUpdateOnDemand);
52 if (!isInEffect()) 52 if (!isInEffect())
53 return nullptr; 53 return nullptr;
54 54
55 double iteration = currentIteration(); 55 double iteration = currentIteration();
56 ASSERT(iteration >= 0); 56 ASSERT(iteration >= 0);
57 // FIXME: Handle iteration values which overflow int. 57 // FIXME: Handle iteration values which overflow int.
58 return m_effect->sample(static_cast<int>(iteration), timeFraction(), iterati onDuration()); 58 return m_effect->sample(static_cast<int>(iteration), timeFraction(), iterati onDuration());
59 } 59 }
60 60
61 double InertAnimation::calculateTimeToEffectChange(bool, double, double) const 61 double InertAnimation::calculateTimeToEffectChange(bool, double, double) const
62 { 62 {
63 return std::numeric_limits<double>::infinity(); 63 return std::numeric_limits<double>::infinity();
64 } 64 }
65 65
66 void InertAnimation::trace(Visitor* visitor) 66 void InertAnimation::trace(Visitor* visitor)
67 { 67 {
68 visitor->trace(m_effect); 68 visitor->trace(m_effect);
69 TimedItem::trace(visitor); 69 AnimationSource::trace(visitor);
70 } 70 }
71 71
72 } // namespace WebCore 72 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/animation/InertAnimation.h ('k') | Source/core/animation/Keyframe.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698