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

Unified Diff: Source/core/platform/graphics/ContentDecryptionModule.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/ContentDecryptionModule.cpp
diff --git a/Source/core/platform/graphics/ContentDecryptionModule.cpp b/Source/core/platform/graphics/ContentDecryptionModule.cpp
deleted file mode 100644
index a10dde10d33c773de85e7e7dc7a93d1681c6c8e9..0000000000000000000000000000000000000000
--- a/Source/core/platform/graphics/ContentDecryptionModule.cpp
+++ /dev/null
@@ -1,80 +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/ContentDecryptionModule.h"
-
-#include "platform/NotImplemented.h"
-#include "core/platform/graphics/ContentDecryptionModuleSession.h"
-#include "public/platform/Platform.h"
-
-namespace WebCore {
-
-bool ContentDecryptionModule::supportsKeySystem(const String& keySystem)
-{
- // FIXME: Chromium should handle this, possibly using
- // MIMETypeRegistry::isSupportedEncryptedMediaMIMEType().
- notImplemented();
- return keySystem == "org.w3.clearkey";
-}
-
-PassOwnPtr<ContentDecryptionModule> ContentDecryptionModule::create(const String& keySystem)
-{
- ASSERT(!keySystem.isEmpty());
- OwnPtr<WebKit::WebContentDecryptionModule> cdm = adoptPtr(WebKit::Platform::current()->createContentDecryptionModule(keySystem));
- if (!cdm)
- return nullptr;
- return adoptPtr(new ContentDecryptionModule(cdm.release()));
-}
-
-ContentDecryptionModule::ContentDecryptionModule(PassOwnPtr<WebKit::WebContentDecryptionModule> cdm)
- : m_cdm(cdm)
-{
- ASSERT(m_cdm);
-}
-
-ContentDecryptionModule::~ContentDecryptionModule()
-{
-}
-
-bool ContentDecryptionModule::supportsMIMEType(const String& mimeType)
-{
- // FIXME: Chromium should handle this, possibly using
- // MIMETypeRegistry::isSupportedEncryptedMediaMIMEType().
- notImplemented();
- return mimeType == "video/webm";
-}
-
-PassOwnPtr<ContentDecryptionModuleSession> ContentDecryptionModule::createSession(ContentDecryptionModuleSessionClient* client)
-{
- return adoptPtr(new ContentDecryptionModuleSession(m_cdm.get(), client));
-}
-
-} // namespace WebCore

Powered by Google App Engine
This is Rietveld 408576698