| OLD | NEW |
| 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 | 48 |
| 49 PassOwnPtr<Vector<RefPtr<Interpolation> > > InertAnimation::sample() | 49 PassOwnPtr<Vector<RefPtr<Interpolation> > > InertAnimation::sample() |
| 50 { | 50 { |
| 51 updateInheritedTime(0); | 51 updateInheritedTime(0); |
| 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()); | 58 return m_effect->sample(static_cast<int>(iteration), timeFraction(), duratio
n()); |
| 59 } | 59 } |
| 60 | 60 |
| 61 | 61 |
| 62 double InertAnimation::calculateTimeToEffectChange(bool, double, double) const | 62 double InertAnimation::calculateTimeToEffectChange(bool, double, double) const |
| 63 { | 63 { |
| 64 return std::numeric_limits<double>::infinity(); | 64 return std::numeric_limits<double>::infinity(); |
| 65 } | 65 } |
| 66 | 66 |
| 67 } // namespace WebCore | 67 } // namespace WebCore |
| OLD | NEW |