| 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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 const double result = m_timing.playbackRate | 85 const double result = m_timing.playbackRate |
| 86 ? repeatedDuration() / std::abs(m_timing.playbackRate) | 86 ? repeatedDuration() / std::abs(m_timing.playbackRate) |
| 87 : std::numeric_limits<double>::infinity(); | 87 : std::numeric_limits<double>::infinity(); |
| 88 ASSERT(result >= 0); | 88 ASSERT(result >= 0); |
| 89 return result; | 89 return result; |
| 90 } | 90 } |
| 91 | 91 |
| 92 void AnimationEffect::updateSpecifiedTiming(const Timing& timing) | 92 void AnimationEffect::updateSpecifiedTiming(const Timing& timing) |
| 93 { | 93 { |
| 94 // FIXME: Test whether the timing is actually different? | 94 // FIXME: Test whether the timing is actually different? |
| 95 if (m_timing == timing) | |
| 96 return; | |
| 97 m_timing = timing; | 95 m_timing = timing; |
| 98 invalidate(); | 96 invalidate(); |
| 99 if (m_animation) | 97 if (m_animation) |
| 100 m_animation->setOutdated(); | 98 m_animation->setOutdated(); |
| 101 specifiedTimingChanged(); | 99 specifiedTimingChanged(); |
| 102 if (m_animation) | 100 if (m_animation) |
| 103 InspectorInstrumentation::animationTimingUpdated(m_animation->timeline()
->document(), m_animation); | 101 InspectorInstrumentation::animationTimingUpdated(m_animation->timeline()
->document(), m_animation); |
| 104 } | 102 } |
| 105 | 103 |
| 106 void AnimationEffect::computedTiming(ComputedTimingProperties& computedTiming) | 104 void AnimationEffect::computedTiming(ComputedTimingProperties& computedTiming) |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 } | 231 } |
| 234 | 232 |
| 235 DEFINE_TRACE(AnimationEffect) | 233 DEFINE_TRACE(AnimationEffect) |
| 236 { | 234 { |
| 237 visitor->trace(m_parent); | 235 visitor->trace(m_parent); |
| 238 visitor->trace(m_animation); | 236 visitor->trace(m_animation); |
| 239 visitor->trace(m_eventDelegate); | 237 visitor->trace(m_eventDelegate); |
| 240 } | 238 } |
| 241 | 239 |
| 242 } // namespace blink | 240 } // namespace blink |
| OLD | NEW |