Oilpan: Enable Oilpan by default in modules/encryptedmedia

Source/modules/encryptedmedia/MediaKeys.cpp

 /*
  * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 35 matching lines @@
 
 static bool isKeySystemSupportedWithContentType(const String& keySystem, const String& contentType)
 {
     ASSERT(!keySystem.isEmpty());
 
     ContentType type(contentType);
     String codecs = type.parameter("codecs");
     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:
 
     // 1. If keySystem is an empty string, throw an InvalidAccessError exception and abort these steps.
     if (keySystem.isEmpty()) {
         exceptionState.throwDOMException(InvalidAccessError, "The key system provided is invalid.");
-        return nullptr;
+        return 0;
     }
 
     // 2. If keySystem is not one of the user agent's supported Key Systems, throw a NotSupportedError and abort these steps.
     if (!isKeySystemSupportedWithContentType(keySystem, "")) {
         exceptionState.throwDOMException(NotSupportedError, "The '" + keySystem + "' key system is not supported.");
-        return nullptr;
+        return 0;
     }
 
     // 3. Let cdm be the content decryption module corresponding to keySystem.
     // 4. Load cdm if necessary.
     Document* document = toDocument(context);
     MediaKeysController* controller = MediaKeysController::from(document->page());
     OwnPtr<blink::WebContentDecryptionModule> cdm = controller->createContentDecryptionModule(context, keySystem);
     if (!cdm) {
         exceptionState.throwDOMException(NotSupportedError, "A content decryption module could not be loaded for the '" + keySystem + "' key system.");
-        return nullptr;
+        return 0;
     }
 
     // 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)
     : ContextLifecycleObserver(context)
-    , m_mediaElement(0)
     , m_keySystem(keySystem)
     , m_cdm(cdm)
     , m_initializeNewSessionTimer(this, &MediaKeys::initializeNewSessionTimerFired)
-#if !ENABLE(OILPAN)
-    , m_weakFactory(this)
-#endif
 {
     WTF_LOG(Media, "MediaKeys::MediaKeys");
     ScriptWrappable::init(this);
 }
 
 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");
 
     // From <http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html#dom-createsession>:
     // The createSession(type, initData) method must run the following steps:
     // Note: The contents of initData are container-specific Initialization Data.
 
     if (contentType.isEmpty()) {
         exceptionState.throwDOMException(InvalidAccessError, "The contentType provided ('" + contentType + "') is empty.");
-        return nullptr;
+        return 0;
     }
 
     if (!initData->length()) {
         exceptionState.throwDOMException(InvalidAccessError, "The initData provided is empty.");
-        return nullptr;
+        return 0;
     }
 
     // 1. If type contains a MIME type that is not supported or is not supported by the keySystem,
     // throw a NOT_SUPPORTED_ERR exception and abort these steps.
     if (!isKeySystemSupportedWithContentType(m_keySystem, contentType)) {
         exceptionState.throwDOMException(NotSupportedError, "The type provided ('" + contentType + "') is unsupported.");
-        return nullptr;
+        return 0;
     }
 
     // 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.
 
     // 3. Add the new object to an internal list of session objects (not needed).
 
     // 4. Schedule a task to initialize the session, providing type, initData, and the new object.
     m_pendingInitializeNewSessionData.append(InitializeNewSessionData(session, contentType, initData));
 
     if (!m_initializeNewSessionTimer.isActive())
@@ skipping 18 matching lines @@
 
     // 3. If contentType is an empty string, return true and abort these steps.
     if (contentType.isEmpty())
         return true;
 
     // 4. If the Key System specified by keySystem does not support decrypting the container and/or
     // codec specified by contentType, return false and abort these steps.
     return isKeySystemSupportedWithContentType(keySystem, contentType);
 }
 
-void MediaKeys::setMediaElement(HTMLMediaElement* element)
-{
-    // FIXME: Cause HTMLMediaElement::setMediaKeys() to throw an exception if m_mediaElement is not 0
-    // and remove the code that prevents the assert below in HTMLMediaElement.
-    ASSERT(!m_mediaElement != !element);
-    m_mediaElement = element;
-}
-
 blink::WebContentDecryptionModule* MediaKeys::contentDecryptionModule()
 {
     return m_cdm.get();
 }
 
 void MediaKeys::initializeNewSessionTimerFired(Timer<MediaKeys>*)
 {
     ASSERT(m_pendingInitializeNewSessionData.size());
 
     while (!m_pendingInitializeNewSessionData.isEmpty()) {
@@ skipping 15 matching lines @@
 
 void MediaKeys::contextDestroyed()
 {
     ContextLifecycleObserver::contextDestroyed();
 
     // We don't need the CDM anymore.
     m_cdm.clear();
 }
 
 }