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

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: sync method Created 6 years, 4 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 497bac55359bd476ca495bb9ae6a02877d729a8e..73a2379a458ed31d3389390ee91af0be7becd23c 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,8 @@ 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 setContentDecryptionModuleSync(WebContentDecryptionModule* cdm) { }
ddorwin 2014/08/08 02:50:52 This probably warrants a comment. Also, since it s
jrummell 2014/08/08 23:15:13 Done.
+ virtual void setContentDecryptionModule(WebContentDecryptionModule* cdm, WebContentDecryptionModuleResult result) { result.completeWithError(WebContentDecryptionModuleExceptionNotSupportedError, 0, "ERROR"); }
// Sets the poster image URL.
virtual void setPoster(const WebURL& poster) { }
« Source/web/WebMediaPlayerClientImpl.cpp ('K') | « Source/web/WebMediaPlayerClientImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698