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

Unified Diff: Source/modules/encryptedmedia/CDM.h

Issue 16387015: Make unprefixed EME APIs use platform and Chromium. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: KURL.h moved 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
« no previous file with comments | « Source/core/testing/MockCDM.cpp ('k') | Source/modules/encryptedmedia/CDM.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/encryptedmedia/CDM.h
diff --git a/Source/modules/encryptedmedia/CDM.h b/Source/modules/encryptedmedia/CDM.h
deleted file mode 100644
index 4b52ed7e74ce19fe72cf00fd85202341a420f8b7..0000000000000000000000000000000000000000
--- a/Source/modules/encryptedmedia/CDM.h
+++ /dev/null
@@ -1,95 +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.
- */
-
-#ifndef CDM_h
-#define CDM_h
-
-#if ENABLE(ENCRYPTED_MEDIA_V2)
-
-#include "wtf/Forward.h"
-#include "wtf/PassRefPtr.h"
-#include "wtf/Uint8Array.h"
-#include "wtf/text/WTFString.h"
-
-namespace WebCore {
-
-class CDM;
-class CDMPrivateInterface;
-class CDMSession;
-class MediaPlayer;
-
-typedef PassOwnPtr<CDMPrivateInterface> (*CreateCDM)(CDM*);
-typedef bool (*CDMSupportsKeySystem)(const String&);
-
-class CDMClient {
-public:
- virtual ~CDMClient() { }
-
- virtual MediaPlayer* cdmMediaPlayer(const CDM*) const = 0;
-};
-
-class CDMSession {
-public:
- CDMSession() { }
- virtual ~CDMSession() { }
-
- virtual const String& sessionId() const = 0;
- virtual PassRefPtr<Uint8Array> generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode) = 0;
- virtual void releaseKeys() = 0;
- virtual bool update(Uint8Array*, RefPtr<Uint8Array>& nextMessage, unsigned short& errorCode, unsigned long& systemCode) = 0;
-};
-
-class CDM {
-public:
-
- enum CDMErrorCode { UnknownError = 1, ClientError, ServiceError, OutputError, HardwareChangeError, DomainError };
- static bool supportsKeySystem(const String&);
- static PassOwnPtr<CDM> create(const String& keySystem);
- static void registerCDMFactory(CreateCDM, CDMSupportsKeySystem);
- ~CDM();
-
- bool supportsMIMEType(const String&) const;
- PassOwnPtr<CDMSession> createSession();
-
- const String& keySystem() const { return m_keySystem; }
-
- CDMClient* client() const { return m_client; }
- void setClient(CDMClient* client) { m_client = client; }
-
- MediaPlayer* mediaPlayer() const;
-
-private:
- CDM(const String& keySystem);
-
- String m_keySystem;
- OwnPtr<CDMPrivateInterface> m_private;
- CDMClient* m_client;
-};
-
-}
-
-#endif // ENABLE(ENCRYPTED_MEDIA_V2)
-
-#endif // CDM_h
« no previous file with comments | « Source/core/testing/MockCDM.cpp ('k') | Source/modules/encryptedmedia/CDM.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698