Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(151)

Side by Side Diff: third_party/WebKit/Source/core/animation/Animation.h

Issue 2567913002: Rename ActiveDOMObject to SuspendableObject (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 20 matching lines...) Expand all
31 #ifndef Animation_h 31 #ifndef Animation_h
32 #define Animation_h 32 #define Animation_h
33 33
34 #include "bindings/core/v8/ActiveScriptWrappable.h" 34 #include "bindings/core/v8/ActiveScriptWrappable.h"
35 #include "bindings/core/v8/ExceptionStatePlaceholder.h" 35 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
36 #include "bindings/core/v8/ScriptPromise.h" 36 #include "bindings/core/v8/ScriptPromise.h"
37 #include "bindings/core/v8/ScriptPromiseProperty.h" 37 #include "bindings/core/v8/ScriptPromiseProperty.h"
38 #include "core/CSSPropertyNames.h" 38 #include "core/CSSPropertyNames.h"
39 #include "core/CoreExport.h" 39 #include "core/CoreExport.h"
40 #include "core/animation/AnimationEffectReadOnly.h" 40 #include "core/animation/AnimationEffectReadOnly.h"
41 #include "core/dom/ActiveDOMObject.h"
42 #include "core/dom/DOMException.h" 41 #include "core/dom/DOMException.h"
42 #include "core/dom/SuspendableObject.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 #include <memory>
49 49
50 namespace blink { 50 namespace blink {
51 51
52 class AnimationTimeline; 52 class AnimationTimeline;
53 class CompositorAnimationPlayer; 53 class CompositorAnimationPlayer;
54 class Element; 54 class Element;
55 class ExceptionState; 55 class ExceptionState;
56 class TreeScope; 56 class TreeScope;
57 57
58 class CORE_EXPORT Animation final : public EventTargetWithInlineData, 58 class CORE_EXPORT Animation final : public EventTargetWithInlineData,
59 public ActiveScriptWrappable, 59 public ActiveScriptWrappable,
60 public ActiveDOMObject, 60 public SuspendableObject,
61 public CompositorAnimationDelegate, 61 public CompositorAnimationDelegate,
62 public CompositorAnimationPlayerClient { 62 public CompositorAnimationPlayerClient {
63 DEFINE_WRAPPERTYPEINFO(); 63 DEFINE_WRAPPERTYPEINFO();
64 USING_GARBAGE_COLLECTED_MIXIN(Animation); 64 USING_GARBAGE_COLLECTED_MIXIN(Animation);
65 USING_PRE_FINALIZER(Animation, dispose); 65 USING_PRE_FINALIZER(Animation, dispose);
66 66
67 public: 67 public:
68 enum AnimationPlayState { Unset, Idle, Pending, Running, Paused, Finished }; 68 enum AnimationPlayState { Unset, Idle, Pending, Running, Paused, Finished };
69 69
70 static Animation* create(AnimationEffectReadOnly*, AnimationTimeline*); 70 static Animation* create(AnimationEffectReadOnly*, AnimationTimeline*);
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 312
313 bool m_currentTimePending; 313 bool m_currentTimePending;
314 bool m_stateIsBeingUpdated; 314 bool m_stateIsBeingUpdated;
315 315
316 bool m_effectSuppressed; 316 bool m_effectSuppressed;
317 }; 317 };
318 318
319 } // namespace blink 319 } // namespace blink
320 320
321 #endif // Animation_h 321 #endif // Animation_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698