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

Unified Diff: public/web/WebFrameClient.h

Issue 1125353004: Separate encrypted media functions out of WebMediaPlayerClient interface (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase and comments fix Created 5 years, 5 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
« no previous file with comments | « public/platform/WebMediaPlayerEncryptedMediaClient.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: public/web/WebFrameClient.h
diff --git a/public/web/WebFrameClient.h b/public/web/WebFrameClient.h
index 8cd3149246537b66696b76b07c3aa15b9e69edd1..38e19aeba156ba1ea7123d789c930783cb5edbbc 100644
--- a/public/web/WebFrameClient.h
+++ b/public/web/WebFrameClient.h
@@ -73,6 +73,7 @@ class WebFormElement;
class WebGeolocationClient;
class WebMediaPlayer;
class WebMediaPlayerClient;
+class WebMediaPlayerEncryptedMediaClient;
class WebMIDIClient;
class WebNotificationPermissionCallback;
class WebPermissionClient;
@@ -108,9 +109,12 @@ public:
// May return null.
virtual WebPlugin* createPlugin(WebLocalFrame*, const WebPluginParams&) { return 0; }
+ // TODO(srirama): Remove this method once chromium updated.
+ virtual WebMediaPlayer* createMediaPlayer(WebLocalFrame*, const WebURL&, WebMediaPlayerClient*, WebContentDecryptionModule*) { return 0; }
+
// May return null.
// WebContentDecryptionModule* may be null if one has not yet been set.
- virtual WebMediaPlayer* createMediaPlayer(WebLocalFrame*, const WebURL&, WebMediaPlayerClient*, WebContentDecryptionModule*) { return 0; }
+ virtual WebMediaPlayer* createMediaPlayer(WebLocalFrame*, const WebURL&, WebMediaPlayerClient*, WebMediaPlayerEncryptedMediaClient*, WebContentDecryptionModule*) { return 0; }
// May return null.
virtual WebApplicationCacheHost* createApplicationCacheHost(WebLocalFrame*, WebApplicationCacheHostClient*) { return 0; }
« no previous file with comments | « public/platform/WebMediaPlayerEncryptedMediaClient.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698