Make unprefixed EME APIs use platform and Chromium.

Source/core/platform/graphics/ContentDecryptionModuleSession.cpp

 /*
- * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2013 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
  *     * Neither the name of Google Inc. nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN 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 "core/platform/network/BlobRegistryProxy.h"
+#include "core/platform/graphics/ContentDecryptionModuleSession.h"
 
 #include "core/platform/KURL.h"
-#include "core/platform/network/BlobData.h"
+#include "core/platform/NotImplemented.h"
 #include "public/platform/Platform.h"
-#include "public/platform/WebBlobData.h"
-#include "public/platform/WebBlobRegistry.h"
+#include "public/platform/WebContentDecryptionModule.h"
 #include "public/platform/WebURL.h"
-#include <wtf/MainThread.h>
-#include <wtf/StdLibExtras.h>
+#include "wtf/Uint8Array.h"
 
 namespace WebCore {
 
-BlobRegistry& blobRegistry()
+ContentDecryptionModuleSession::ContentDecryptionModuleSession(WebKit::WebContentDecryptionModule& ContentDecryptionModule, ContentDecryptionModuleSessionClient* client)

[abarth-chromium, 2013/06/12 23:03:51]

WebKit::WebContentDecryptionModule&   ->   WebKit::WebContentDecryptionModule*

I generally prefer if we pass heap objects by pointer rather than by reference. 
I know that in Chromium using a reference is an idiom for a non-null pointer,
but that's not enforced by the compiler and can be misleading.

[ddorwin, 2013/06/12 23:55:54]

Done. I was trying to avoid calling leakPtr() at the call site (and at the same
time indicate that it wouldn't hang on to that pointer). I agree it is unusual,
but leakPtr() seems like a red flag too.

+    : m_client(client)
 {
-    ASSERT(isMainThread());
-    DEFINE_STATIC_LOCAL(BlobRegistryProxy, instance, ());
-    return instance;
+    m_session = adoptPtr(ContentDecryptionModule.createSession(this));
+    ASSERT(m_session);
 }
 
-BlobRegistryProxy::BlobRegistryProxy()
-    : m_webBlobRegistry(WebKit::Platform::current()->blobRegistry())
+ContentDecryptionModuleSession::~ContentDecryptionModuleSession()
 {
 }
 
-void BlobRegistryProxy::registerBlobURL(const KURL& url, PassOwnPtr<BlobData> blobData)
+String ContentDecryptionModuleSession::sessionId() const
 {
-    if (m_webBlobRegistry) {
-        WebKit::WebBlobData webBlobData(blobData);
-        m_webBlobRegistry->registerBlobURL(url, webBlobData);
-    }
+    return m_session->sessionId();
 }
 
-void BlobRegistryProxy::registerBlobURL(const KURL& url, const KURL& srcURL)
+void ContentDecryptionModuleSession::generateKeyRequest(const String& mimeType, const Uint8Array& initData)
 {
-    if (m_webBlobRegistry)
-        m_webBlobRegistry->registerBlobURL(url, srcURL);
+    m_session->generateKeyRequest(mimeType, initData.data(), initData.length());
 }
 
-void BlobRegistryProxy::unregisterBlobURL(const KURL& url)
+void ContentDecryptionModuleSession::update(const Uint8Array& key)
 {
-    if (m_webBlobRegistry)
-        m_webBlobRegistry->unregisterBlobURL(url);
+    m_session->update(key.data(), key.length());
+}
+
+void ContentDecryptionModuleSession::close()
+{
+    m_session->close();
+}
+
+void ContentDecryptionModuleSession::keyAdded()
+{
+    m_client->keyAdded();
+}
+
+void ContentDecryptionModuleSession::keyError(MediaKeyErrorCode errorCode, unsigned long systemCode)
+{
+    m_client->keyError(static_cast<ContentDecryptionModuleSessionClient::MediaKeyErrorCode>(errorCode), systemCode);
+}
+
+void ContentDecryptionModuleSession::keyMessage(const unsigned char* message, size_t messageLength, const WebKit::WebURL& destinationURL)
+{
+    m_client->keyMessage(message, messageLength, destinationURL);
 }
 
 } // namespace WebCore