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

Unified Diff: webkit/media/webmediaplayer_impl.h

Issue 10020053: Initial implementation of Encrypted Media Extensions in Chrome. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 8 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: webkit/media/webmediaplayer_impl.h
diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h
index fc803a37211cf8a813d200b45581ae812a9e4539..271c737ecda5095c5e8f8e8396aab9ff17bc79e0 100644
--- a/webkit/media/webmediaplayer_impl.h
+++ b/webkit/media/webmediaplayer_impl.h
@@ -184,6 +184,23 @@ class WebMediaPlayerImpl
virtual bool sourceAppend(const unsigned char* data, unsigned length);
virtual void sourceEndOfStream(EndOfStreamStatus status);
+ virtual MediaKeyException generateKeyRequest(
+ const WebKit::WebString& keySystem,
scherkus (not reviewing) 2012/04/12 20:18:41 chromium style unix_hacker here + below
ddorwin 2012/04/12 23:41:23 Done. Too much copying of code from WebKit. :)
+ const unsigned char* initData,
+ unsigned initDataLength);
+
+ virtual MediaKeyException addKey(const WebKit::WebString& keySystem,
+ const unsigned char* key,
+ unsigned keyLength,
+ const unsigned char* initData,
+ unsigned initDataLength,
+ const WebKit::WebString& sessionId);
+
+ virtual MediaKeyException cancelKeyRequest(
+ const WebKit::WebString& keySystem,
+ const WebKit::WebString& sessionId);
+
+
// As we are closing the tab or even the browser, |main_loop_| is destroyed
// even before this object gets destructed, so we need to know when
// |main_loop_| is being destroyed and we can stop posting repaint task
@@ -221,6 +238,21 @@ class WebMediaPlayerImpl
// Lets V8 know that player uses extra resources not managed by V8.
void IncrementExternallyAllocatedMemory();
+ void generateKeyRequestTask(const WebKit::WebString& keySystem,
+ const unsigned char* initData,
+ unsigned initDataLength,
+ uint32_t sessionId);
+
+ void addKeyTask(const WebKit::WebString& keySystem,
+ const unsigned char* key,
+ unsigned keyLength,
+ const unsigned char* initData,
+ unsigned initDataLength,
+ const WebKit::WebString& sessionId);
+
+ void cancelKeyRequestTask(const WebKit::WebString& keySystem,
+ const WebKit::WebString& sessionId);
+
WebKit::WebFrame* frame_;
// TODO(hclam): get rid of these members and read from the pipeline directly.

Powered by Google App Engine
This is Rietveld 408576698