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

Unified Diff: public/platform/WebMediaPlayer.h

Issue 423633002: Make HTMLMediaElement.setMediaKeys() asynchronous. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Move initial_cdm to constructor Created 6 years, 3 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: public/platform/WebMediaPlayer.h
diff --git a/public/platform/WebMediaPlayer.h b/public/platform/WebMediaPlayer.h
index cf9c7415d7c08aec7b0852135d8aeaefe6c3a673..54fd850f51875e568236614de2451f8e254ba6bc 100644
--- a/public/platform/WebMediaPlayer.h
+++ b/public/platform/WebMediaPlayer.h
@@ -32,6 +32,7 @@
#define WebMediaPlayer_h
#include "WebCanvas.h"
+#include "WebContentDecryptionModule.h"
#include "WebMediaSource.h"
#include "WebString.h"
#include "WebTimeRange.h"
@@ -154,7 +155,7 @@ public:
virtual MediaKeyException generateKeyRequest(const WebString& keySystem, const unsigned char* initData, unsigned initDataLength) { return MediaKeyExceptionKeySystemNotSupported; }
virtual MediaKeyException addKey(const WebString& keySystem, const unsigned char* key, unsigned keyLength, const unsigned char* initData, unsigned initDataLength, const WebString& sessionId) { return MediaKeyExceptionKeySystemNotSupported; }
virtual MediaKeyException cancelKeyRequest(const WebString& keySystem, const WebString& sessionId) { return MediaKeyExceptionKeySystemNotSupported; }
- virtual void setContentDecryptionModule(WebContentDecryptionModule* cdm) { }
+ virtual void setContentDecryptionModule(WebContentDecryptionModule* cdm, WebContentDecryptionModuleResult result) { result.completeWithError(WebContentDecryptionModuleExceptionNotSupportedError, 0, "ERROR"); }
// Sets the poster image URL.
virtual void setPoster(const WebURL& poster) { }

Powered by Google App Engine
This is Rietveld 408576698