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

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

Issue 732153003: Update a result vector when sampling animation effects. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « Source/core/animation/InertAnimation.h ('k') | Source/core/animation/InterpolationEffect.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 28 matching lines...) Expand all
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 : AnimationNode(timing) 43 : AnimationNode(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 void InertAnimation::sample(double inheritedTime, OwnPtrWillBeRawPtr<WillBeHeapV ector<RefPtrWillBeMember<Interpolation>>>& result)
50 { 50 {
51 updateInheritedTime(inheritedTime, TimingUpdateOnDemand); 51 updateInheritedTime(inheritedTime, TimingUpdateOnDemand);
52 if (!isInEffect()) 52 if (!isInEffect()) {
53 return nullptr; 53 result.clear();
54 return;
55 }
54 56
55 double iteration = currentIteration(); 57 double iteration = currentIteration();
56 ASSERT(iteration >= 0); 58 ASSERT(iteration >= 0);
57 // FIXME: Handle iteration values which overflow int. 59 // FIXME: Handle iteration values which overflow int.
58 return m_effect->sample(static_cast<int>(iteration), timeFraction(), iterati onDuration()); 60 return m_effect->sample(static_cast<int>(iteration), timeFraction(), iterati onDuration(), result);
59 } 61 }
60 62
61 double InertAnimation::calculateTimeToEffectChange(bool, double, double) const 63 double InertAnimation::calculateTimeToEffectChange(bool, double, double) const
62 { 64 {
63 return std::numeric_limits<double>::infinity(); 65 return std::numeric_limits<double>::infinity();
64 } 66 }
65 67
66 void InertAnimation::trace(Visitor* visitor) 68 void InertAnimation::trace(Visitor* visitor)
67 { 69 {
68 visitor->trace(m_effect); 70 visitor->trace(m_effect);
69 AnimationNode::trace(visitor); 71 AnimationNode::trace(visitor);
70 } 72 }
71 73
72 } // namespace blink 74 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/animation/InertAnimation.h ('k') | Source/core/animation/InterpolationEffect.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698