| 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 10 matching lines...) Expand all Loading... |
| 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
| 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "sky/engine/config.h" |
| 32 #include "core/animation/CompositorPendingAnimations.h" | 32 #include "sky/engine/core/animation/CompositorPendingAnimations.h" |
| 33 | 33 |
| 34 #include "core/animation/Animation.h" | 34 #include "sky/engine/core/animation/Animation.h" |
| 35 #include "core/animation/AnimationTimeline.h" | 35 #include "sky/engine/core/animation/AnimationTimeline.h" |
| 36 #include "core/frame/FrameView.h" | 36 #include "sky/engine/core/frame/FrameView.h" |
| 37 #include "core/page/Page.h" | 37 #include "sky/engine/core/page/Page.h" |
| 38 #include "core/rendering/RenderLayer.h" | 38 #include "sky/engine/core/rendering/RenderLayer.h" |
| 39 | 39 |
| 40 namespace blink { | 40 namespace blink { |
| 41 | 41 |
| 42 void CompositorPendingAnimations::add(AnimationPlayer* player) | 42 void CompositorPendingAnimations::add(AnimationPlayer* player) |
| 43 { | 43 { |
| 44 ASSERT(player); | 44 ASSERT(player); |
| 45 ASSERT(m_pending.find(player) == kNotFound); | 45 ASSERT(m_pending.find(player) == kNotFound); |
| 46 m_pending.append(player); | 46 m_pending.append(player); |
| 47 | 47 |
| 48 Document* document = player->timeline()->document(); | 48 Document* document = player->timeline()->document(); |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 AnimationPlayer* player = m_waitingForCompositorAnimationStart[i].get(); | 126 AnimationPlayer* player = m_waitingForCompositorAnimationStart[i].get(); |
| 127 if (player->hasStartTime()) | 127 if (player->hasStartTime()) |
| 128 continue; | 128 continue; |
| 129 player->notifyCompositorStartTime(monotonicAnimationStartTime - player->
timeline()->zeroTime()); | 129 player->notifyCompositorStartTime(monotonicAnimationStartTime - player->
timeline()->zeroTime()); |
| 130 } | 130 } |
| 131 | 131 |
| 132 m_waitingForCompositorAnimationStart.clear(); | 132 m_waitingForCompositorAnimationStart.clear(); |
| 133 } | 133 } |
| 134 | 134 |
| 135 } // namespace | 135 } // namespace |
| OLD | NEW |