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

Side by Side Diff: Source/platform/drm/ContentDecryptionModuleSession.h

Issue 117323005: MediaKeySession: update(key) -> update(response). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: comments addressed Created 6 years, 11 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 15 matching lines...) Expand all
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef ContentDecryptionModuleSession_h 31 #ifndef ContentDecryptionModuleSession_h
32 #define ContentDecryptionModuleSession_h 32 #define ContentDecryptionModuleSession_h
33 33
34 #include "platform/PlatformExport.h" 34 #include "platform/PlatformExport.h"
35 #include "public/platform/WebContentDecryptionModuleSession.h" 35 #include "public/platform/WebContentDecryptionModuleSession.h"
36 #include "wtf/Forward.h"
36 #include "wtf/OwnPtr.h" 37 #include "wtf/OwnPtr.h"
37 #include "wtf/PassOwnPtr.h" 38 #include "wtf/PassOwnPtr.h"
38 #include "wtf/text/WTFString.h" 39 #include "wtf/text/WTFString.h"
39 40
40 namespace blink { 41 namespace blink {
41 class WebContentDecryptionModule; 42 class WebContentDecryptionModule;
42 } 43 }
43 44
44 namespace WTF {
45 class Uint8Array;
46 }
47
48 namespace WebCore { 45 namespace WebCore {
49 46
50 class KURL; 47 class KURL;
51 48
52 class PLATFORM_EXPORT ContentDecryptionModuleSessionClient { 49 class PLATFORM_EXPORT ContentDecryptionModuleSessionClient {
53 public: 50 public:
54 enum MediaKeyErrorCode { UnknownError = 1, ClientError }; 51 enum MediaKeyErrorCode { UnknownError = 1, ClientError };
55 virtual void keyAdded() = 0; 52 virtual void keyAdded() = 0;
56 virtual void keyError(MediaKeyErrorCode, unsigned long systemCode) = 0; 53 virtual void keyError(MediaKeyErrorCode, unsigned long systemCode) = 0;
57 virtual void keyMessage(const unsigned char* message, size_t messageLength, const KURL& destinationURL) = 0; 54 virtual void keyMessage(const unsigned char* message, size_t messageLength, const KURL& destinationURL) = 0;
58 }; 55 };
59 56
60 class PLATFORM_EXPORT ContentDecryptionModuleSession : private blink::WebContent DecryptionModuleSession::Client { 57 class PLATFORM_EXPORT ContentDecryptionModuleSession : private blink::WebContent DecryptionModuleSession::Client {
61 WTF_MAKE_NONCOPYABLE(ContentDecryptionModuleSession); 58 WTF_MAKE_NONCOPYABLE(ContentDecryptionModuleSession);
62 public: 59 public:
63 static PassOwnPtr<ContentDecryptionModuleSession> create(ContentDecryptionMo duleSessionClient*); 60 static PassOwnPtr<ContentDecryptionModuleSession> create(ContentDecryptionMo duleSessionClient*);
64 61
65 ContentDecryptionModuleSession(blink::WebContentDecryptionModule*, ContentDe cryptionModuleSessionClient*); 62 ContentDecryptionModuleSession(blink::WebContentDecryptionModule*, ContentDe cryptionModuleSessionClient*);
66 ~ContentDecryptionModuleSession(); 63 ~ContentDecryptionModuleSession();
67 64
68 String sessionId() const; 65 String sessionId() const;
69 void generateKeyRequest(const String& mimeType, const WTF::Uint8Array& initD ata); 66 void generateKeyRequest(const String& mimeType, const Uint8Array& initData);
70 void update(const WTF::Uint8Array& key); 67 void update(const Uint8Array& response);
71 void close(); 68 void close();
72 69
73 private: 70 private:
74 // blink::WebContentDecryptionModuleSession::Client 71 // blink::WebContentDecryptionModuleSession::Client
75 virtual void keyAdded() OVERRIDE; 72 virtual void keyAdded() OVERRIDE;
76 virtual void keyError(MediaKeyErrorCode, unsigned long systemCode) OVERRIDE; 73 virtual void keyError(MediaKeyErrorCode, unsigned long systemCode) OVERRIDE;
77 virtual void keyMessage(const unsigned char* message, size_t messageLength, const blink::WebURL& destinationURL) OVERRIDE; 74 virtual void keyMessage(const unsigned char* message, size_t messageLength, const blink::WebURL& destinationURL) OVERRIDE;
78 75
79 OwnPtr<blink::WebContentDecryptionModuleSession> m_session; 76 OwnPtr<blink::WebContentDecryptionModuleSession> m_session;
80 77
81 ContentDecryptionModuleSessionClient* m_client; 78 ContentDecryptionModuleSessionClient* m_client;
82 }; 79 };
83 80
84 } // namespace WebCore 81 } // namespace WebCore
85 82
86 #endif // ContentDecryptionModuleSession_h 83 #endif // ContentDecryptionModuleSession_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698