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

Side by Side Diff: third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef HTMLMediaElementEncryptedMedia_h 5 #ifndef HTMLMediaElementEncryptedMedia_h
6 #define HTMLMediaElementEncryptedMedia_h 6 #define HTMLMediaElementEncryptedMedia_h
7 7
8 #include "core/EventTypeNames.h" 8 #include "core/EventTypeNames.h"
9 #include "core/dom/DOMTypedArray.h" 9 #include "core/dom/DOMTypedArray.h"
10 #include "core/events/EventTarget.h" 10 #include "core/events/EventTarget.h"
11 #include "modules/ModulesExport.h" 11 #include "modules/ModulesExport.h"
12 #include "platform/Supplementable.h" 12 #include "platform/Supplementable.h"
13 #include "platform/heap/Handle.h" 13 #include "platform/heap/Handle.h"
14 #include "public/platform/WebEncryptedMediaTypes.h" 14 #include "public/platform/WebEncryptedMediaTypes.h"
15 #include "public/platform/WebMediaPlayerEncryptedMediaClient.h" 15 #include "public/platform/WebMediaPlayerEncryptedMediaClient.h"
16 16
17 namespace blink { 17 namespace blink {
18 18
19 class ExceptionState; 19 class ExceptionState;
20 class HTMLMediaElement; 20 class HTMLMediaElement;
21 class MediaKeys; 21 class MediaKeys;
22 class ScriptPromise; 22 class ScriptPromise;
23 class ScriptState; 23 class ScriptState;
24 class WebContentDecryptionModule; 24 class WebContentDecryptionModule;
25 class WebMediaPlayer; 25 class WebMediaPlayer;
26 26
27 class MODULES_EXPORT HTMLMediaElementEncryptedMedia final : public NoBaseWillBeG arbageCollectedFinalized<HTMLMediaElementEncryptedMedia>, public WillBeHeapSuppl ement<HTMLMediaElement>, public WebMediaPlayerEncryptedMediaClient { 27 class MODULES_EXPORT HTMLMediaElementEncryptedMedia final : public GarbageCollec tedFinalized<HTMLMediaElementEncryptedMedia>, public HeapSupplement<HTMLMediaEle ment>, public WebMediaPlayerEncryptedMediaClient {
28 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(HTMLMediaElementEncryptedMedia); 28 USING_GARBAGE_COLLECTED_MIXIN(HTMLMediaElementEncryptedMedia);
29 USING_FAST_MALLOC_WILL_BE_REMOVED(HTMLMediaElementEncryptedMedia);
30 public: 29 public:
31 // encrypted media extensions (v0.1b) 30 // encrypted media extensions (v0.1b)
32 static void webkitGenerateKeyRequest(HTMLMediaElement&, const String& keySys tem, PassRefPtr<DOMUint8Array> initData, ExceptionState&); 31 static void webkitGenerateKeyRequest(HTMLMediaElement&, const String& keySys tem, PassRefPtr<DOMUint8Array> initData, ExceptionState&);
33 static void webkitGenerateKeyRequest(HTMLMediaElement&, const String& keySys tem, ExceptionState&); 32 static void webkitGenerateKeyRequest(HTMLMediaElement&, const String& keySys tem, ExceptionState&);
34 static void webkitAddKey(HTMLMediaElement&, const String& keySystem, PassRef Ptr<DOMUint8Array> key, PassRefPtr<DOMUint8Array> initData, const String& sessio nId, ExceptionState&); 33 static void webkitAddKey(HTMLMediaElement&, const String& keySystem, PassRef Ptr<DOMUint8Array> key, PassRefPtr<DOMUint8Array> initData, const String& sessio nId, ExceptionState&);
35 static void webkitAddKey(HTMLMediaElement&, const String& keySystem, PassRef Ptr<DOMUint8Array> key, ExceptionState&); 34 static void webkitAddKey(HTMLMediaElement&, const String& keySystem, PassRef Ptr<DOMUint8Array> key, ExceptionState&);
36 static void webkitCancelKeyRequest(HTMLMediaElement&, const String& keySyste m, const String& sessionId, ExceptionState&); 35 static void webkitCancelKeyRequest(HTMLMediaElement&, const String& keySyste m, const String& sessionId, ExceptionState&);
37 36
38 DEFINE_STATIC_ATTRIBUTE_EVENT_LISTENER(webkitkeyadded); 37 DEFINE_STATIC_ATTRIBUTE_EVENT_LISTENER(webkitkeyadded);
39 DEFINE_STATIC_ATTRIBUTE_EVENT_LISTENER(webkitkeyerror); 38 DEFINE_STATIC_ATTRIBUTE_EVENT_LISTENER(webkitkeyerror);
(...skipping 23 matching lines...) Expand all
63 62
64 private: 63 private:
65 friend class SetMediaKeysHandler; 64 friend class SetMediaKeysHandler;
66 65
67 HTMLMediaElementEncryptedMedia(HTMLMediaElement&); 66 HTMLMediaElementEncryptedMedia(HTMLMediaElement&);
68 void generateKeyRequest(WebMediaPlayer*, const String& keySystem, PassRefPtr <DOMUint8Array> initData, ExceptionState&); 67 void generateKeyRequest(WebMediaPlayer*, const String& keySystem, PassRefPtr <DOMUint8Array> initData, ExceptionState&);
69 void addKey(WebMediaPlayer*, const String& keySystem, PassRefPtr<DOMUint8Arr ay> key, PassRefPtr<DOMUint8Array> initData, const String& sessionId, ExceptionS tate&); 68 void addKey(WebMediaPlayer*, const String& keySystem, PassRefPtr<DOMUint8Arr ay> key, PassRefPtr<DOMUint8Array> initData, const String& sessionId, ExceptionS tate&);
70 void cancelKeyRequest(WebMediaPlayer*, const String& keySystem, const String & sessionId, ExceptionState&); 69 void cancelKeyRequest(WebMediaPlayer*, const String& keySystem, const String & sessionId, ExceptionState&);
71 70
72 // EventTarget 71 // EventTarget
73 bool setAttributeEventListener(const AtomicString& eventType, PassRefPtrWill BeRawPtr<EventListener>); 72 bool setAttributeEventListener(const AtomicString& eventType, RawPtr<EventLi stener>);
74 EventListener* getAttributeEventListener(const AtomicString& eventType); 73 EventListener* getAttributeEventListener(const AtomicString& eventType);
75 74
76 // Currently we have both EME v0.1b and EME WD implemented in media element. 75 // Currently we have both EME v0.1b and EME WD implemented in media element.
77 // But we do not want to support both at the same time. The one used first 76 // But we do not want to support both at the same time. The one used first
78 // will be supported. Use |m_emeMode| to track this selection. 77 // will be supported. Use |m_emeMode| to track this selection.
79 // FIXME: Remove EmeMode once EME v0.1b support is removed. See crbug.com/24 9976. 78 // FIXME: Remove EmeMode once EME v0.1b support is removed. See crbug.com/24 9976.
80 enum EmeMode { EmeModeNotSelected, EmeModePrefixed, EmeModeUnprefixed }; 79 enum EmeMode { EmeModeNotSelected, EmeModePrefixed, EmeModeUnprefixed };
81 80
82 // check (and set if necessary) the encrypted media extensions (EME) mode 81 // check (and set if necessary) the encrypted media extensions (EME) mode
83 // (v0.1b or WD). Returns whether the mode is allowed and successfully set. 82 // (v0.1b or WD). Returns whether the mode is allowed and successfully set.
84 bool setEmeMode(EmeMode); 83 bool setEmeMode(EmeMode);
85 84
86 RawPtrWillBeMember<HTMLMediaElement> m_mediaElement; 85 Member<HTMLMediaElement> m_mediaElement;
87 EmeMode m_emeMode; 86 EmeMode m_emeMode;
88 87
89 bool m_isWaitingForKey; 88 bool m_isWaitingForKey;
90 89
91 PersistentWillBeMember<MediaKeys> m_mediaKeys; 90 Member<MediaKeys> m_mediaKeys;
92 }; 91 };
93 92
94 } // namespace blink 93 } // namespace blink
95 94
96 #endif 95 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698