| 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 , m_effect(effect) | 43 , m_effect(effect) |
| 44 { | 44 { |
| 45 } | 45 } |
| 46 | 46 |
| 47 PassOwnPtr<AnimationEffect::CompositableValueMap> InertAnimation::sample() | 47 PassOwnPtr<AnimationEffect::CompositableValueMap> InertAnimation::sample() |
| 48 { | 48 { |
| 49 updateInheritedTime(0); | 49 updateInheritedTime(0); |
| 50 return isInEffect() ? m_effect->sample(currentIteration(), timeFraction()) :
nullptr; | 50 return isInEffect() ? m_effect->sample(currentIteration(), timeFraction()) :
nullptr; |
| 51 } | 51 } |
| 52 | 52 |
| 53 |
| 54 double InertAnimation::calculateTimeToEffectChange(double, double, Phase) const |
| 55 { |
| 56 return std::numeric_limits<double>::infinity(); |
| 57 } |
| 58 |
| 53 } // namespace WebCore | 59 } // namespace WebCore |
| OLD | NEW |