Chromium Code Reviews| Index: Source/platform/animation/TimingFunction.cpp |
| diff --git a/Source/platform/animation/TimingFunction.cpp b/Source/platform/animation/TimingFunction.cpp |
| index a7c0ee18bf92c402b3eb0ce95ef3a94ac30bffc6..e50ed8d3239f7a9e2c0f456dc72aa58a86470902 100644 |
| --- a/Source/platform/animation/TimingFunction.cpp |
| +++ b/Source/platform/animation/TimingFunction.cpp |
| @@ -40,7 +40,6 @@ String CubicBezierTimingFunction::toString() const |
| double CubicBezierTimingFunction::evaluate(double fraction, double accuracy) const |
| { |
| - ASSERT_WITH_MESSAGE(fraction >= 0 && fraction <= 1, "Web Animations not yet implemented: Timing function behavior outside the range [0, 1] is not yet specified"); |
| if (!m_bezier) |
| m_bezier = adoptPtr(new UnitBezier(m_x1, m_y1, m_x2, m_y2)); |
| return m_bezier->solve(fraction, accuracy); |
| @@ -78,7 +77,6 @@ String StepsTimingFunction::toString() const |
| double StepsTimingFunction::evaluate(double fraction, double) const |
| { |
| - ASSERT_WITH_MESSAGE(fraction >= 0 && fraction <= 1, "Web Animations not yet implemented: Timing function behavior outside the range [0, 1] is not yet specified"); |
| double startOffset = 0; |
| switch (m_stepAtPosition) { |
| case StepAtStart: |
| @@ -94,7 +92,7 @@ double StepsTimingFunction::evaluate(double fraction, double) const |
| ASSERT_NOT_REACHED(); |
| break; |
| } |
| - return std::min(1.0, floor((m_steps * fraction) + startOffset) / m_steps); |
| + return std::min(std::max(floor((m_steps * fraction) + startOffset) / m_steps, 0.0), 1.0); |
|
alancutter (OOO until 2018)
2014/04/16 04:50:42
clampTo()?
shans
2014/04/17 06:04:18
Done.
|
| } |
| // Equals operators |