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

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

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.h
diff --git a/Source/core/platform/graphics/ContentDecryptionModuleSession.h b/Source/core/platform/graphics/ContentDecryptionModuleSession.h
deleted file mode 100644
index 30ead6fe8baefd3374c583e4f84459ec89709721..0000000000000000000000000000000000000000
--- a/Source/core/platform/graphics/ContentDecryptionModuleSession.h
+++ /dev/null
@@ -1,84 +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.
- */
-
-#ifndef ContentDecryptionModuleSession_h
-#define ContentDecryptionModuleSession_h
-
-#include "public/platform/WebContentDecryptionModuleSession.h"
-#include "wtf/OwnPtr.h"
-#include "wtf/PassOwnPtr.h"
-#include "wtf/text/WTFString.h"
-
-namespace WebKit {
-class WebContentDecryptionModule;
-}
-
-namespace WTF {
-class Uint8Array;
-}
-
-namespace WebCore {
-
-class KURL;
-
-class ContentDecryptionModuleSessionClient {
-public:
- enum MediaKeyErrorCode { UnknownError = 1, ClientError };
- virtual void keyAdded() = 0;
- virtual void keyError(MediaKeyErrorCode, unsigned long systemCode) = 0;
- virtual void keyMessage(const unsigned char* message, size_t messageLength, const KURL& destinationURL) = 0;
-};
-
-class ContentDecryptionModuleSession : private WebKit::WebContentDecryptionModuleSession::Client {
-public:
- static PassOwnPtr<ContentDecryptionModuleSession> create(ContentDecryptionModuleSessionClient*);
-
- ContentDecryptionModuleSession(WebKit::WebContentDecryptionModule*, ContentDecryptionModuleSessionClient*);
- ~ContentDecryptionModuleSession();
-
- String sessionId() const;
- void generateKeyRequest(const String& mimeType, const WTF::Uint8Array& initData);
- void update(const WTF::Uint8Array& key);
- void close();
-
-private:
- // WebKit::WebContentDecryptionModuleSession::Client
- virtual void keyAdded() OVERRIDE;
- virtual void keyError(MediaKeyErrorCode, unsigned long systemCode) OVERRIDE;
- virtual void keyMessage(const unsigned char* message, size_t messageLength, const WebKit::WebURL& destinationURL) OVERRIDE;
-
- OwnPtr<WebKit::WebContentDecryptionModuleSession> m_session;
-
- ContentDecryptionModuleSessionClient* m_client;
-};
-
-} // namespace WebCore
-
-#endif // ContentDecryptionModuleSession_h

Powered by Google App Engine
This is Rietveld 408576698