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

Side by Side Diff: third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.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 Apple Inc. All rights reserved. 2 * Copyright (C) 2013 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 11 matching lines...) Expand all
22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23 * THE POSSIBILITY OF SUCH DAMAGE. 23 * THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef MediaKeys_h 26 #ifndef MediaKeys_h
27 #define MediaKeys_h 27 #define MediaKeys_h
28 28
29 #include "bindings/core/v8/ActiveScriptWrappable.h" 29 #include "bindings/core/v8/ActiveScriptWrappable.h"
30 #include "bindings/core/v8/ScriptPromise.h" 30 #include "bindings/core/v8/ScriptPromise.h"
31 #include "bindings/core/v8/ScriptWrappable.h" 31 #include "bindings/core/v8/ScriptWrappable.h"
32 #include "core/dom/ActiveDOMObject.h"
33 #include "core/dom/DOMArrayPiece.h" 32 #include "core/dom/DOMArrayPiece.h"
33 #include "core/dom/SuspendableObject.h"
34 #include "platform/Timer.h" 34 #include "platform/Timer.h"
35 #include "public/platform/WebContentDecryptionModule.h" 35 #include "public/platform/WebContentDecryptionModule.h"
36 #include "public/platform/WebEncryptedMediaTypes.h" 36 #include "public/platform/WebEncryptedMediaTypes.h"
37 #include "public/platform/WebString.h" 37 #include "public/platform/WebString.h"
38 #include "public/platform/WebVector.h" 38 #include "public/platform/WebVector.h"
39 #include "wtf/Forward.h" 39 #include "wtf/Forward.h"
40 #include "wtf/text/WTFString.h" 40 #include "wtf/text/WTFString.h"
41 #include <memory> 41 #include <memory>
42 42
43 namespace blink { 43 namespace blink {
44 44
45 class ExceptionState; 45 class ExceptionState;
46 class ExecutionContext; 46 class ExecutionContext;
47 class HTMLMediaElement; 47 class HTMLMediaElement;
48 class MediaKeySession; 48 class MediaKeySession;
49 class ScriptState; 49 class ScriptState;
50 class WebContentDecryptionModule; 50 class WebContentDecryptionModule;
51 51
52 // References are held by JS and HTMLMediaElement. 52 // References are held by JS and HTMLMediaElement.
53 // The WebContentDecryptionModule has the same lifetime as this object. 53 // The WebContentDecryptionModule has the same lifetime as this object.
54 class MediaKeys : public GarbageCollectedFinalized<MediaKeys>, 54 class MediaKeys : public GarbageCollectedFinalized<MediaKeys>,
55 public ActiveScriptWrappable, 55 public ActiveScriptWrappable,
56 public ActiveDOMObject, 56 public SuspendableObject,
57 public ScriptWrappable { 57 public ScriptWrappable {
58 USING_GARBAGE_COLLECTED_MIXIN(MediaKeys); 58 USING_GARBAGE_COLLECTED_MIXIN(MediaKeys);
59 DEFINE_WRAPPERTYPEINFO(); 59 DEFINE_WRAPPERTYPEINFO();
60 60
61 public: 61 public:
62 static MediaKeys* create( 62 static MediaKeys* create(
63 ExecutionContext*, 63 ExecutionContext*,
64 const WebVector<WebEncryptedMediaSessionType>& supportedSessionTypes, 64 const WebVector<WebEncryptedMediaSessionType>& supportedSessionTypes,
65 std::unique_ptr<WebContentDecryptionModule>); 65 std::unique_ptr<WebContentDecryptionModule>);
66 ~MediaKeys() override; 66 ~MediaKeys() override;
(...skipping 18 matching lines...) Expand all
85 void cancelReservation(); 85 void cancelReservation();
86 86
87 // The previously reserved and accepted HTMLMediaElement is no longer 87 // The previously reserved and accepted HTMLMediaElement is no longer
88 // using this object. 88 // using this object.
89 void clearMediaElement(); 89 void clearMediaElement();
90 90
91 WebContentDecryptionModule* contentDecryptionModule(); 91 WebContentDecryptionModule* contentDecryptionModule();
92 92
93 DECLARE_VIRTUAL_TRACE(); 93 DECLARE_VIRTUAL_TRACE();
94 94
95 // ActiveDOMObject implementation. 95 // SuspendableObject implementation.
96 // FIXME: This class could derive from ContextLifecycleObserver 96 // FIXME: This class could derive from ContextLifecycleObserver
97 // again (http://crbug.com/483722). 97 // again (http://crbug.com/483722).
98 void contextDestroyed() override; 98 void contextDestroyed() override;
99 99
100 // ScriptWrappable implementation. 100 // ScriptWrappable implementation.
101 bool hasPendingActivity() const final; 101 bool hasPendingActivity() const final;
102 102
103 private: 103 private:
104 MediaKeys( 104 MediaKeys(
105 ExecutionContext*, 105 ExecutionContext*,
(...skipping 21 matching lines...) Expand all
127 // object will be prevented until the setMediaKeys() completes. 127 // object will be prevented until the setMediaKeys() completes.
128 bool m_reservedForMediaElement; 128 bool m_reservedForMediaElement;
129 129
130 HeapDeque<Member<PendingAction>> m_pendingActions; 130 HeapDeque<Member<PendingAction>> m_pendingActions;
131 Timer<MediaKeys> m_timer; 131 Timer<MediaKeys> m_timer;
132 }; 132 };
133 133
134 } // namespace blink 134 } // namespace blink
135 135
136 #endif // MediaKeys_h 136 #endif // MediaKeys_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698