| 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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 if (animation->playing() && !animation->hasStartTime() && | 83 if (animation->playing() && !animation->hasStartTime() && |
| 84 animation->timeline() && animation->timeline()->isActive()) { | 84 animation->timeline() && animation->timeline()->isActive()) { |
| 85 waitingForStartTime.push_back(animation.get()); | 85 waitingForStartTime.push_back(animation.get()); |
| 86 } | 86 } |
| 87 } else { | 87 } else { |
| 88 deferred.push_back(animation); | 88 deferred.push_back(animation); |
| 89 } | 89 } |
| 90 } | 90 } |
| 91 | 91 |
| 92 // If any synchronized animations were started on the compositor, all | 92 // If any synchronized animations were started on the compositor, all |
| 93 // remaning synchronized animations need to wait for the synchronized | 93 // remaining synchronized animations need to wait for the synchronized |
| 94 // start time. Otherwise they may start immediately. | 94 // start time. Otherwise they may start immediately. |
| 95 if (startedSynchronizedOnCompositor) { | 95 if (startedSynchronizedOnCompositor) { |
| 96 for (auto& animation : waitingForStartTime) { | 96 for (auto& animation : waitingForStartTime) { |
| 97 if (!animation->hasStartTime()) { | 97 if (!animation->hasStartTime()) { |
| 98 m_waitingForCompositorAnimationStart.push_back(animation); | 98 m_waitingForCompositorAnimationStart.push_back(animation); |
| 99 } | 99 } |
| 100 } | 100 } |
| 101 } else { | 101 } else { |
| 102 for (auto& animation : waitingForStartTime) { | 102 for (auto& animation : waitingForStartTime) { |
| 103 if (!animation->hasStartTime()) { | 103 if (!animation->hasStartTime()) { |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 animation->timeline()->zeroTime()); | 160 animation->timeline()->zeroTime()); |
| 161 } | 161 } |
| 162 } | 162 } |
| 163 | 163 |
| 164 DEFINE_TRACE(CompositorPendingAnimations) { | 164 DEFINE_TRACE(CompositorPendingAnimations) { |
| 165 visitor->trace(m_pending); | 165 visitor->trace(m_pending); |
| 166 visitor->trace(m_waitingForCompositorAnimationStart); | 166 visitor->trace(m_waitingForCompositorAnimationStart); |
| 167 } | 167 } |
| 168 | 168 |
| 169 } // namespace blink | 169 } // namespace blink |
| OLD | NEW |