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

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

Issue 1345163007: Web Animations: Handle iteration values which overflow int. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 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 | « no previous file | Source/core/animation/KeyframeEffect.cpp » ('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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 void InertEffect::sample(OwnPtr<Vector<RefPtr<Interpolation>>>& result) 51 void InertEffect::sample(OwnPtr<Vector<RefPtr<Interpolation>>>& result)
52 { 52 {
53 updateInheritedTime(m_inheritedTime, TimingUpdateOnDemand); 53 updateInheritedTime(m_inheritedTime, TimingUpdateOnDemand);
54 if (!isInEffect()) { 54 if (!isInEffect()) {
55 result.clear(); 55 result.clear();
56 return; 56 return;
57 } 57 }
58 58
59 double iteration = currentIteration(); 59 double iteration = currentIteration();
60 ASSERT(iteration >= 0); 60 ASSERT(iteration >= 0);
61 // FIXME: Handle iteration values which overflow int. 61 m_model->sample(clampTo<int>(iteration, 0), timeFraction(), iterationDuratio n(), result);
62 m_model->sample(static_cast<int>(iteration), timeFraction(), iterationDurati on(), result);
63 } 62 }
64 63
65 double InertEffect::calculateTimeToEffectChange(bool, double, double) const 64 double InertEffect::calculateTimeToEffectChange(bool, double, double) const
66 { 65 {
67 return std::numeric_limits<double>::infinity(); 66 return std::numeric_limits<double>::infinity();
68 } 67 }
69 68
70 DEFINE_TRACE(InertEffect) 69 DEFINE_TRACE(InertEffect)
71 { 70 {
72 visitor->trace(m_model); 71 visitor->trace(m_model);
73 AnimationEffect::trace(visitor); 72 AnimationEffect::trace(visitor);
74 } 73 }
75 74
76 } // namespace blink 75 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/animation/KeyframeEffect.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698