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 27 matching lines...) Expand all Loading... |
38 #include "core/events/AnimationPlayerEvent.h" | 38 #include "core/events/AnimationPlayerEvent.h" |
39 #include "core/frame/UseCounter.h" | 39 #include "core/frame/UseCounter.h" |
40 #include "core/inspector/InspectorInstrumentation.h" | 40 #include "core/inspector/InspectorInstrumentation.h" |
41 #include "core/inspector/InspectorTraceEvents.h" | 41 #include "core/inspector/InspectorTraceEvents.h" |
42 #include "platform/RuntimeEnabledFeatures.h" | 42 #include "platform/RuntimeEnabledFeatures.h" |
43 #include "platform/TraceEvent.h" | 43 #include "platform/TraceEvent.h" |
44 #include "platform/animation/CompositorAnimationPlayer.h" | 44 #include "platform/animation/CompositorAnimationPlayer.h" |
45 #include "public/platform/Platform.h" | 45 #include "public/platform/Platform.h" |
46 #include "public/platform/WebCompositorSupport.h" | 46 #include "public/platform/WebCompositorSupport.h" |
47 #include "wtf/MathExtras.h" | 47 #include "wtf/MathExtras.h" |
| 48 #include "wtf/PtrUtil.h" |
48 | 49 |
49 namespace blink { | 50 namespace blink { |
50 | 51 |
51 namespace { | 52 namespace { |
52 | 53 |
53 static unsigned nextSequenceNumber() | 54 static unsigned nextSequenceNumber() |
54 { | 55 { |
55 static unsigned next = 0; | 56 static unsigned next = 0; |
56 return ++next; | 57 return ++next; |
57 } | 58 } |
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
286 m_currentTimePending = false; | 287 m_currentTimePending = false; |
287 } | 288 } |
288 | 289 |
289 if (shouldStart) { | 290 if (shouldStart) { |
290 m_compositorGroup = compositorGroup; | 291 m_compositorGroup = compositorGroup; |
291 if (startOnCompositor) { | 292 if (startOnCompositor) { |
292 if (isCandidateForAnimationOnCompositor()) | 293 if (isCandidateForAnimationOnCompositor()) |
293 createCompositorPlayer(); | 294 createCompositorPlayer(); |
294 | 295 |
295 if (maybeStartAnimationOnCompositor()) | 296 if (maybeStartAnimationOnCompositor()) |
296 m_compositorState = adoptPtr(new CompositorState(*this)); | 297 m_compositorState = wrapUnique(new CompositorState(*this)); |
297 else | 298 else |
298 cancelIncompatibleAnimationsOnCompositor(); | 299 cancelIncompatibleAnimationsOnCompositor(); |
299 } | 300 } |
300 } | 301 } |
301 | 302 |
302 return true; | 303 return true; |
303 } | 304 } |
304 | 305 |
305 void Animation::postCommit(double timelineTime) | 306 void Animation::postCommit(double timelineTime) |
306 { | 307 { |
(...skipping 777 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1084 visitor->trace(m_timeline); | 1085 visitor->trace(m_timeline); |
1085 visitor->trace(m_pendingFinishedEvent); | 1086 visitor->trace(m_pendingFinishedEvent); |
1086 visitor->trace(m_pendingCancelledEvent); | 1087 visitor->trace(m_pendingCancelledEvent); |
1087 visitor->trace(m_finishedPromise); | 1088 visitor->trace(m_finishedPromise); |
1088 visitor->trace(m_readyPromise); | 1089 visitor->trace(m_readyPromise); |
1089 EventTargetWithInlineData::trace(visitor); | 1090 EventTargetWithInlineData::trace(visitor); |
1090 ActiveDOMObject::trace(visitor); | 1091 ActiveDOMObject::trace(visitor); |
1091 } | 1092 } |
1092 | 1093 |
1093 } // namespace blink | 1094 } // namespace blink |
OLD | NEW |