| 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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 m_players.add(result); | 76 m_players.add(result); |
| 77 setOutdatedAnimationPlayer(result); | 77 setOutdatedAnimationPlayer(result); |
| 78 return result; | 78 return result; |
| 79 } | 79 } |
| 80 | 80 |
| 81 AnimationPlayer* AnimationTimeline::play(AnimationNode* child) | 81 AnimationPlayer* AnimationTimeline::play(AnimationNode* child) |
| 82 { | 82 { |
| 83 if (!m_document) | 83 if (!m_document) |
| 84 return 0; | 84 return 0; |
| 85 AnimationPlayer* player = createAnimationPlayer(child); | 85 AnimationPlayer* player = createAnimationPlayer(child); |
| 86 player->setStartTimeInternal(effectiveTime()); | |
| 87 m_document->compositorPendingAnimations().add(player); | 86 m_document->compositorPendingAnimations().add(player); |
| 88 return player; | 87 return player; |
| 89 } | 88 } |
| 90 | 89 |
| 91 void AnimationTimeline::wake() | 90 void AnimationTimeline::wake() |
| 92 { | 91 { |
| 93 m_timing->serviceOnNextFrame(); | 92 m_timing->serviceOnNextFrame(); |
| 94 } | 93 } |
| 95 | 94 |
| 96 void AnimationTimeline::serviceAnimations(TimingUpdateReason reason) | 95 void AnimationTimeline::serviceAnimations(TimingUpdateReason reason) |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 224 | 223 |
| 225 void AnimationTimeline::trace(Visitor* visitor) | 224 void AnimationTimeline::trace(Visitor* visitor) |
| 226 { | 225 { |
| 227 visitor->trace(m_document); | 226 visitor->trace(m_document); |
| 228 visitor->trace(m_timing); | 227 visitor->trace(m_timing); |
| 229 visitor->trace(m_playersNeedingUpdate); | 228 visitor->trace(m_playersNeedingUpdate); |
| 230 visitor->trace(m_players); | 229 visitor->trace(m_players); |
| 231 } | 230 } |
| 232 | 231 |
| 233 } // namespace | 232 } // namespace |
| OLD | NEW |