Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1306)

Unified Diff: Source/core/platform/graphics/CDMSessionChromium.cpp

Issue 16387015: Make unprefixed EME APIs use platform and Chromium. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/platform/graphics/CDMSessionChromium.cpp
diff --git a/Source/core/platform/graphics/CDMSessionChromium.cpp b/Source/core/platform/graphics/CDMSessionChromium.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..6be2bd26a80ee940458c30b5535ad0aa6781366a
--- /dev/null
+++ b/Source/core/platform/graphics/CDMSessionChromium.cpp
@@ -0,0 +1,100 @@
+/*
+ * 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/graphics/CDMSessionChromium.h"
+
+#include "core/platform/KURL.h"
+#include "core/platform/NotImplemented.h"
+#include "public/platform/Platform.h"
+#include "public/platform/WebCDM.h"
+#include "public/platform/WebURL.h"
+#include "wtf/Uint8Array.h"
+#include "wtf/text/WTFString.h"
+
+namespace WebCore {
+
+CDMSessionChromium::CDMSessionChromium(WebKit::WebCDM& cdm, CDMSessionClient* client)
+ : m_client(client)
+{
+ m_session = adoptPtr(cdm.createSession(this));
+ ASSERT(m_session);
+}
+
+WTF::String CDMSessionChromium::sessionId() const
+{
+ return m_session->sessionId();
+}
+
+void CDMSessionChromium::generateKeyRequest(const WTF::String& mimeType, const Uint8Array& initData)
+{
+ m_session->generateKeyRequest(mimeType, initData.data(), initData.length());
+}
+
+void CDMSessionChromium::update(const Uint8Array& key)
+{
+ m_session->update(key.data(), key.length());
+}
+
+void CDMSessionChromium::close()
+{
+ m_session->close();
+}
+
+void CDMSessionChromium::keyAdded()
+{
+ m_client->keyAdded();
+}
+
+void CDMSessionChromium::keyError(MediaKeyErrorCode code, unsigned long systemCode)
+{
+ // FIXME: Should we be using types from core/html/MediaKeyError.h here?
ddorwin 2013/06/06 23:29:50 abarth: Can you help me answer these two questions
abarth-chromium 2013/06/07 00:08:23 Files inside core/platform cannot include headers
ddorwin 2013/06/10 22:52:34 Done.
+ // FIXME: There is no type checking because Code is and unsigned short. Can we make it an enum?
+ MediaKeyError::Code mediaKeyErrorCode = MediaKeyError::MEDIA_KEYERR_UNKNOWN;
+ switch (code) {
+ case MediaKeyErrorCodeUnknown:
+ mediaKeyErrorCode = MediaKeyError::MEDIA_KEYERR_UNKNOWN;
+ break;
+ case MediaKeyErrorCodeClient:
+ mediaKeyErrorCode = MediaKeyError::MEDIA_KEYERR_CLIENT;
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ }
+
+ m_client->keyError(mediaKeyErrorCode, systemCode);
+}
+
+void CDMSessionChromium::keyMessage(const unsigned char* message, unsigned messageLength, const WebKit::WebURL& destinationURL)
+{
+ m_client->keyMessage(message, messageLength, destinationURL);
+}
+
+} // namespace WebCore

Powered by Google App Engine
This is Rietveld 408576698