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

Unified Diff: Source/modules/encryptedmedia/CDM.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/modules/encryptedmedia/CDM.cpp
diff --git a/Source/modules/encryptedmedia/CDM.cpp b/Source/modules/encryptedmedia/CDM.cpp
deleted file mode 100644
index 6103de5f5b3719d6be1f2256e7f035597ade4200..0000000000000000000000000000000000000000
--- a/Source/modules/encryptedmedia/CDM.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * 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
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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"
-
-#if ENABLE(ENCRYPTED_MEDIA_V2)
-
-#include "modules/encryptedmedia/CDM.h"
-
-#include "core/html/MediaKeyError.h"
-#include "modules/encryptedmedia/CDMPrivate.h"
-#include "modules/encryptedmedia/MediaKeys.h"
-#include "wtf/text/WTFString.h"
-
-namespace WebCore {
-
-struct CDMFactory {
- WTF_MAKE_NONCOPYABLE(CDMFactory); WTF_MAKE_FAST_ALLOCATED;
-public:
- CDMFactory(CreateCDM constructor, CDMSupportsKeySystem supportsKeySystem)
- : constructor(constructor)
- , supportsKeySystem(supportsKeySystem)
- {
- }
-
- CreateCDM constructor;
- CDMSupportsKeySystem supportsKeySystem;
-};
-
-static Vector<CDMFactory*>& installedCDMFactories()
-{
- DEFINE_STATIC_LOCAL(Vector<CDMFactory*>, cdms, ());
- static bool queriedCDMs = false;
- if (!queriedCDMs) {
- queriedCDMs = true;
-
- // FIXME: initialize specific UA CDMs. http://webkit.org/b/109318, http://webkit.org/b/109320
- }
-
- return cdms;
-}
-
-void CDM::registerCDMFactory(CreateCDM constructor, CDMSupportsKeySystem supportsKeySystem)
-{
- installedCDMFactories().append(new CDMFactory(constructor, supportsKeySystem));
-}
-
-static CDMFactory* CDMFactoryForKeySystem(const String& keySystem)
-{
- Vector<CDMFactory*>& cdmFactories = installedCDMFactories();
- for (size_t i = 0; i < cdmFactories.size(); ++i) {
- if (cdmFactories[i]->supportsKeySystem(keySystem))
- return cdmFactories[i];
- }
- return 0;
-}
-
-bool CDM::supportsKeySystem(const String& keySystem)
-{
- return CDMFactoryForKeySystem(keySystem);
-}
-
-PassOwnPtr<CDM> CDM::create(const String& keySystem)
-{
- if (!supportsKeySystem(keySystem))
- return nullptr;
-
- return adoptPtr(new CDM(keySystem));
-}
-
-CDM::CDM(const String& keySystem)
- : m_keySystem(keySystem)
- , m_client(0)
-{
- m_private = CDMFactoryForKeySystem(keySystem)->constructor(this);
-}
-
-CDM::~CDM()
-{
-}
-
-bool CDM::supportsMIMEType(const String& mimeType) const
-{
- return m_private->supportsMIMEType(mimeType);
-}
-
-PassOwnPtr<CDMSession> CDM::createSession()
-{
- return m_private->createSession();
-}
-
-MediaPlayer* CDM::mediaPlayer() const
-{
- if (!m_client)
- return 0;
- return m_client->cdmMediaPlayer(this);
-}
-
-}
-
-#endif // ENABLE(ENCRYPTED_MEDIA_V2)

Powered by Google App Engine
This is Rietveld 408576698