Create Pepper-based CDM for EME WD (Blink changes)

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 10 matching lines @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "modules/encryptedmedia/MediaKeys.h"
 
 #include "bindings/v8/ExceptionState.h"
 #include "core/dom/ContextLifecycleObserver.h"
+#include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/events/ThreadLocalEventNames.h"
 #include "core/html/HTMLMediaElement.h"
 #include "modules/encryptedmedia/MediaKeyMessageEvent.h"
+#include "modules/encryptedmedia/MediaKeysClient.h"
+#include "modules/encryptedmedia/MediaKeysController.h"
 #include "platform/ContentType.h"
 #include "platform/Logging.h"
 #include "platform/MIMETypeRegistry.h"
 #include "platform/UUID.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebContentDecryptionModule.h"
 #include "wtf/HashSet.h"
 
 namespace WebCore {
 
@@ skipping 18 matching lines @@
     }
 
     // 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;
     }
 
     // 3. Let cdm be the content decryption module corresponding to keySystem.
     // 4. Load cdm if necessary.
-    OwnPtr<blink::WebContentDecryptionModule> cdm = adoptPtr(blink::Platform::current()->createContentDecryptionModule(keySystem));
+    Document* document = toDocument(context);
+    ASSERT(document);

[acolwell GONE FROM CHROMIUM, 2014/03/17 23:34:45]

nit: No need for an ASSERT here since you'll NPE on the next line if it's null.

[jrummell, 2014/03/18 17:05:31]

Done.

+    MediaKeysController* controller = MediaKeysController::from(document->page());
+    ASSERT(controller);

[acolwell GONE FROM CHROMIUM, 2014/03/17 23:34:45]

ditto.

[jrummell, 2014/03/18 17:05:31]

Done.

+    OwnPtr<blink::WebContentDecryptionModule> cdm = adoptPtr(controller->createContentDecryptionModule(context, keySystem));

[eseidel, 2014/03/17 23:48:03]

Is this really the pattern for web/platform apis, that they return a raw pointer
and expect you to adoptPtr it?  In Blink's implementation we normally use
PassOwnPtr for this, I guess there isn't a web/ equivalent?

[jrummell, 2014/03/18 17:05:31]

Moved the adoptPtr() to MediaKeysClientImpl (where it crosses into Chromium).

     if (!cdm) {
         exceptionState.throwDOMException(NotSupportedError, "A content decryption module could not be loaded for the '" + keySystem + "' key system.");
         return nullptr;
     }
 
     // 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()));
 }
@@ skipping 115 matching lines @@
 
 void MediaKeys::contextDestroyed()
 {
     ContextLifecycleObserver::contextDestroyed();
 
     // We don't need the CDM anymore.
     m_cdm.clear();
 }
 
 }