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

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

Issue 48273013: Move MediaPlayer, IntSizeHash to platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: move MediaPlayer and friends to platform/graphics/media Created 7 years, 2 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/ContentDecryptionModuleSession.cpp
diff --git a/Source/core/platform/graphics/ContentDecryptionModuleSession.cpp b/Source/core/platform/graphics/ContentDecryptionModuleSession.cpp
deleted file mode 100644
index e423c9105abe33e0b8c5435a3f2226ed26c9e2ca..0000000000000000000000000000000000000000
--- a/Source/core/platform/graphics/ContentDecryptionModuleSession.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * 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/ContentDecryptionModuleSession.h"
-
-#include "public/platform/Platform.h"
-#include "public/platform/WebContentDecryptionModule.h"
-#include "public/platform/WebURL.h"
-#include "weborigin/KURL.h"
-#include "wtf/Uint8Array.h"
-
-namespace WebCore {
-
-ContentDecryptionModuleSession::ContentDecryptionModuleSession(WebKit::WebContentDecryptionModule* contentDecryptionModule, ContentDecryptionModuleSessionClient* client)
- : m_client(client)
-{
- m_session = adoptPtr(contentDecryptionModule->createSession(this));
- ASSERT(m_session);
-}
-
-ContentDecryptionModuleSession::~ContentDecryptionModuleSession()
-{
-}
-
-String ContentDecryptionModuleSession::sessionId() const
-{
- return m_session->sessionId();
-}
-
-void ContentDecryptionModuleSession::generateKeyRequest(const String& mimeType, const Uint8Array& initData)
-{
- m_session->generateKeyRequest(mimeType, initData.data(), initData.length());
-}
-
-void ContentDecryptionModuleSession::update(const Uint8Array& key)
-{
- 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

Powered by Google App Engine
This is Rietveld 408576698