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/CSSPropertyNames.h" | 38 #include "core/CSSPropertyNames.h" |
39 #include "core/CoreExport.h" | 39 #include "core/CoreExport.h" |
40 #include "core/animation/AnimationEffect.h" | 40 #include "core/animation/AnimationEffect.h" |
41 #include "core/dom/ActiveDOMObject.h" | 41 #include "core/dom/ActiveDOMObject.h" |
42 #include "core/dom/DOMException.h" | 42 #include "core/dom/DOMException.h" |
43 #include "core/events/EventTarget.h" | 43 #include "core/events/EventTarget.h" |
44 #include "platform/animation/CompositorAnimationDelegate.h" | 44 #include "platform/animation/CompositorAnimationDelegate.h" |
45 #include "platform/animation/CompositorAnimationPlayerClient.h" | 45 #include "platform/animation/CompositorAnimationPlayerClient.h" |
46 #include "platform/heap/Handle.h" | 46 #include "platform/heap/Handle.h" |
47 #include "wtf/RefPtr.h" | 47 #include "wtf/RefPtr.h" |
| 48 #include <memory> |
48 | 49 |
49 namespace blink { | 50 namespace blink { |
50 | 51 |
51 class AnimationTimeline; | 52 class AnimationTimeline; |
52 class CompositorAnimationPlayer; | 53 class CompositorAnimationPlayer; |
53 class Element; | 54 class Element; |
54 class ExceptionState; | 55 class ExceptionState; |
55 | 56 |
56 class CORE_EXPORT Animation final | 57 class CORE_EXPORT Animation final |
57 : public EventTargetWithInlineData | 58 : public EventTargetWithInlineData |
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
287 ~PlayStateUpdateScope(); | 288 ~PlayStateUpdateScope(); |
288 private: | 289 private: |
289 Member<Animation> m_animation; | 290 Member<Animation> m_animation; |
290 AnimationPlayState m_initialPlayState; | 291 AnimationPlayState m_initialPlayState; |
291 CompositorPendingChange m_compositorPendingChange; | 292 CompositorPendingChange m_compositorPendingChange; |
292 }; | 293 }; |
293 | 294 |
294 // This mirrors the known compositor state. It is created when a compositor | 295 // This mirrors the known compositor state. It is created when a compositor |
295 // animation is started. Updated once the start time is known and each time | 296 // animation is started. Updated once the start time is known and each time |
296 // modifications are pushed to the compositor. | 297 // modifications are pushed to the compositor. |
297 OwnPtr<CompositorState> m_compositorState; | 298 std::unique_ptr<CompositorState> m_compositorState; |
298 bool m_compositorPending; | 299 bool m_compositorPending; |
299 int m_compositorGroup; | 300 int m_compositorGroup; |
300 | 301 |
301 OwnPtr<CompositorAnimationPlayer> m_compositorPlayer; | 302 std::unique_ptr<CompositorAnimationPlayer> m_compositorPlayer; |
302 | 303 |
303 bool m_currentTimePending; | 304 bool m_currentTimePending; |
304 bool m_stateIsBeingUpdated; | 305 bool m_stateIsBeingUpdated; |
305 | 306 |
306 bool m_effectSuppressed; | 307 bool m_effectSuppressed; |
307 }; | 308 }; |
308 | 309 |
309 } // namespace blink | 310 } // namespace blink |
310 | 311 |
311 #endif // Animation_h | 312 #endif // Animation_h |
OLD | NEW |