Index: Source/modules/encryptedmedia/MediaKeys.h |
diff --git a/Source/modules/encryptedmedia/MediaKeys.h b/Source/modules/encryptedmedia/MediaKeys.h |
index c1ef548c382a04c1e57cd3be8d4f978bb42d1ce7..6d2e0560f499be493108ae3cd97dcb2d546289fb 100644 |
--- a/Source/modules/encryptedmedia/MediaKeys.h |
+++ b/Source/modules/encryptedmedia/MediaKeys.h |
@@ -52,14 +52,14 @@ class ExceptionState; |
// References are held by JS and HTMLMediaElement. |
// The WebContentDecryptionModule has the same lifetime as this object. |
-class MediaKeys : public RefCountedWillBeGarbageCollectedFinalized<MediaKeys>, public ContextLifecycleObserver, public ScriptWrappable { |
+class MediaKeys : public GarbageCollectedFinalized<MediaKeys>, public ContextLifecycleObserver, public ScriptWrappable { |
public: |
- static PassRefPtrWillBeRawPtr<MediaKeys> create(ExecutionContext*, const String& keySystem, ExceptionState&); |
+ static MediaKeys* create(ExecutionContext*, const String& keySystem, ExceptionState&); |
~MediaKeys(); |
const String& keySystem() const { return m_keySystem; } |
- PassRefPtrWillBeRawPtr<MediaKeySession> createSession(ExecutionContext*, const String& contentType, Uint8Array* initData, ExceptionState&); |
+ MediaKeySession* createSession(ExecutionContext*, const String& contentType, Uint8Array* initData, ExceptionState&); |
static bool isTypeSupported(const String& keySystem, const String& contentType); |
@@ -84,14 +84,14 @@ protected: |
struct InitializeNewSessionData { |
ALLOW_ONLY_INLINE_ALLOCATION(); |
public: |
- InitializeNewSessionData(PassRefPtrWillBeRawPtr<MediaKeySession> session, const String& contentType, PassRefPtr<Uint8Array> initData) |
+ InitializeNewSessionData(MediaKeySession* session, const String& contentType, PassRefPtr<Uint8Array> initData) |
: session(session) |
, contentType(contentType) |
, initData(initData) { } |
void trace(Visitor*); |
- RefPtrWillBeMember<MediaKeySession> session; |
+ Member<MediaKeySession> session; |
String contentType; |
RefPtr<Uint8Array> initData; |
}; |