Index: Source/modules/encryptedmedia/MediaKeys.cpp |
diff --git a/Source/modules/encryptedmedia/MediaKeys.cpp b/Source/modules/encryptedmedia/MediaKeys.cpp |
index 99a19edc8b36bd0b19c82d99f15802079a4374f1..deeee9b995e2f2a36666de32c37aba81fb9bff14 100644 |
--- a/Source/modules/encryptedmedia/MediaKeys.cpp |
+++ b/Source/modules/encryptedmedia/MediaKeys.cpp |
@@ -53,7 +53,7 @@ static bool isKeySystemSupportedWithContentType(const String& keySystem, const S |
return MIMETypeRegistry::isSupportedEncryptedMediaMIMEType(keySystem, type.type(), codecs); |
} |
-PassRefPtrWillBeRawPtr<MediaKeys> MediaKeys::create(ExecutionContext* context, const String& keySystem, ExceptionState& exceptionState) |
+MediaKeys* MediaKeys::create(ExecutionContext* context, const String& keySystem, ExceptionState& exceptionState) |
{ |
// From <http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html#dom-media-keys-constructor>: |
// The MediaKeys(keySystem) constructor must run the following steps: |
@@ -83,7 +83,7 @@ PassRefPtrWillBeRawPtr<MediaKeys> MediaKeys::create(ExecutionContext* context, c |
// 5. Create a new MediaKeys object. |
// 5.1 Let the keySystem attribute be keySystem. |
// 6. Return the new object to the caller. |
- return adoptRefWillBeNoop(new MediaKeys(context, keySystem, cdm.release())); |
+ return new MediaKeys(context, keySystem, cdm.release()); |
} |
MediaKeys::MediaKeys(ExecutionContext* context, const String& keySystem, PassOwnPtr<blink::WebContentDecryptionModule> cdm) |
@@ -104,7 +104,7 @@ MediaKeys::~MediaKeys() |
{ |
} |
-PassRefPtrWillBeRawPtr<MediaKeySession> MediaKeys::createSession(ExecutionContext* context, const String& contentType, Uint8Array* initData, ExceptionState& exceptionState) |
+MediaKeySession* MediaKeys::createSession(ExecutionContext* context, const String& contentType, Uint8Array* initData, ExceptionState& exceptionState) |
{ |
WTF_LOG(Media, "MediaKeys::createSession"); |
@@ -130,11 +130,7 @@ PassRefPtrWillBeRawPtr<MediaKeySession> MediaKeys::createSession(ExecutionContex |
} |
// 2. Create a new MediaKeySession object. |
-#if ENABLE(OILPAN) |
MediaKeySession* session = MediaKeySession::create(context, m_cdm.get(), this); |
-#else |
- RefPtr<MediaKeySession> session = MediaKeySession::create(context, m_cdm.get(), m_weakFactory.createWeakPtr()); |
-#endif |
// 2.1 Let the keySystem attribute be keySystem. |
ASSERT(!session->keySystem().isEmpty()); |
// FIXME: 2.2 Let the state of the session be CREATED. |