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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 if (m_waitingForCompositorAnimationStart.isEmpty()) | 107 if (m_waitingForCompositorAnimationStart.isEmpty()) |
108 return false; | 108 return false; |
109 | 109 |
110 // Check if we're still waiting for any compositor animations to start. | 110 // Check if we're still waiting for any compositor animations to start. |
111 for (size_t i = 0; i < m_waitingForCompositorAnimationStart.size(); ++i) { | 111 for (size_t i = 0; i < m_waitingForCompositorAnimationStart.size(); ++i) { |
112 if (m_waitingForCompositorAnimationStart[i].get()->hasActiveAnimationsOn
Compositor()) | 112 if (m_waitingForCompositorAnimationStart[i].get()->hasActiveAnimationsOn
Compositor()) |
113 return true; | 113 return true; |
114 } | 114 } |
115 | 115 |
116 // If not, go ahead and start any animations that were waiting. | 116 // If not, go ahead and start any animations that were waiting. |
117 notifyCompositorAnimationStarted(monotonicallyIncreasingTime()); | 117 notifyAnimationStarted(monotonicallyIncreasingTime(), false); |
118 | 118 |
119 ASSERT(m_pending.isEmpty()); | 119 ASSERT(m_pending.isEmpty()); |
120 return false; | 120 return false; |
121 } | 121 } |
122 | 122 |
123 void CompositorPendingAnimations::notifyCompositorAnimationStarted(double monoto
nicAnimationStartTime) | 123 void CompositorPendingAnimations::notifyAnimationStarted(double monotonicAnimati
onStartTime, bool startedOnCompositor) |
124 { | 124 { |
| 125 TRACE_EVENT0("blink", "CompositorPendingAnimations::notifyCompositorAnimatio
nStarted"); |
125 for (size_t i = 0; i < m_waitingForCompositorAnimationStart.size(); ++i) { | 126 for (size_t i = 0; i < m_waitingForCompositorAnimationStart.size(); ++i) { |
126 AnimationPlayer* player = m_waitingForCompositorAnimationStart[i].get(); | 127 AnimationPlayer* player = m_waitingForCompositorAnimationStart[i].get(); |
127 if (player->hasStartTime()) | 128 if (player->hasStartTime()) |
128 continue; | 129 continue; |
129 player->notifyCompositorStartTime(monotonicAnimationStartTime - player->
timeline()->zeroTime()); | 130 double effectiveStartTime = monotonicAnimationStartTime - player->timeli
ne()->zeroTime(); |
| 131 if (startedOnCompositor) { |
| 132 player->notifyCompositorStartTime(effectiveStartTime); |
| 133 } else { |
| 134 player->notifyStartTime(effectiveStartTime); |
| 135 } |
130 } | 136 } |
131 | 137 |
132 m_waitingForCompositorAnimationStart.clear(); | 138 m_waitingForCompositorAnimationStart.clear(); |
133 } | 139 } |
134 | 140 |
| 141 void CompositorPendingAnimations::notifyCompositorAnimationStarted(double monoto
nicAnimationStartTime) |
| 142 { |
| 143 TRACE_EVENT0("blink", "CompositorPendingAnimations::notifyCompositorAnimatio
nStarted"); |
| 144 notifyAnimationStarted(monotonicAnimationStartTime, true); |
| 145 } |
| 146 |
135 void CompositorPendingAnimations::trace(Visitor* visitor) | 147 void CompositorPendingAnimations::trace(Visitor* visitor) |
136 { | 148 { |
137 visitor->trace(m_pending); | 149 visitor->trace(m_pending); |
138 visitor->trace(m_waitingForCompositorAnimationStart); | 150 visitor->trace(m_waitingForCompositorAnimationStart); |
139 } | 151 } |
140 | 152 |
141 } // namespace | 153 } // namespace |
OLD | NEW |