| 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 void InertEffect::sample(Vector<RefPtr<Interpolation>>& result) const | 50 void InertEffect::sample(Vector<RefPtr<Interpolation>>& result) const |
| 51 { | 51 { |
| 52 updateInheritedTime(m_inheritedTime, TimingUpdateOnDemand); | 52 updateInheritedTime(m_inheritedTime, TimingUpdateOnDemand); |
| 53 if (!isInEffect()) { | 53 if (!isInEffect()) { |
| 54 result.clear(); | 54 result.clear(); |
| 55 return; | 55 return; |
| 56 } | 56 } |
| 57 | 57 |
| 58 double iteration = currentIteration(); | 58 double iteration = currentIteration(); |
| 59 ASSERT(iteration >= 0); | 59 ASSERT(iteration >= 0); |
| 60 m_model->sample(clampTo<int>(iteration, 0), timeFraction(), iterationDuratio
n(), result); | 60 m_model->sample(clampTo<int>(iteration, 0), progress(), iterationDuration(),
result); |
| 61 } | 61 } |
| 62 | 62 |
| 63 double InertEffect::calculateTimeToEffectChange(bool, double, double) const | 63 double InertEffect::calculateTimeToEffectChange(bool, double, double) const |
| 64 { | 64 { |
| 65 return std::numeric_limits<double>::infinity(); | 65 return std::numeric_limits<double>::infinity(); |
| 66 } | 66 } |
| 67 | 67 |
| 68 DEFINE_TRACE(InertEffect) | 68 DEFINE_TRACE(InertEffect) |
| 69 { | 69 { |
| 70 visitor->trace(m_model); | 70 visitor->trace(m_model); |
| 71 AnimationEffect::trace(visitor); | 71 AnimationEffect::trace(visitor); |
| 72 } | 72 } |
| 73 | 73 |
| 74 } // namespace blink | 74 } // namespace blink |
| OLD | NEW |