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

Unified Diff: content/renderer/media/android/webmediaplayer_android.cc

Issue 1815033003: Add srcObject attribute of type MediaStream to HTMLMediaElement. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: philipj's comments Created 4 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: content/renderer/media/android/webmediaplayer_android.cc
diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc
index ef9ddf1049ce92626fb47ace797fe210b803598d..32b079d9010f267649b91a55712db447c2812695 100644
--- a/content/renderer/media/android/webmediaplayer_android.cc
+++ b/content/renderer/media/android/webmediaplayer_android.cc
@@ -57,6 +57,7 @@
#include "third_party/WebKit/public/platform/WebGraphicsContext3DProvider.h"
#include "third_party/WebKit/public/platform/WebMediaPlayerClient.h"
#include "third_party/WebKit/public/platform/WebMediaPlayerEncryptedMediaClient.h"
+#include "third_party/WebKit/public/platform/WebMediaPlayerSource.h"
#include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
#include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/public/platform/WebURL.h"
@@ -298,8 +299,11 @@ WebMediaPlayerAndroid::~WebMediaPlayerAndroid() {
}
void WebMediaPlayerAndroid::load(LoadType load_type,
- const blink::WebURL& url,
+ const blink::WebMediaPlayerSource& source,
CORSMode cors_mode) {
+ // Only URL or MSE blob URL is supported.
+ DCHECK(source.isURL());
+ blink::WebURL url = source.getAsURL();
if (!defer_load_cb_.is_null()) {
defer_load_cb_.Run(base::Bind(&WebMediaPlayerAndroid::DoLoad,
weak_factory_.GetWeakPtr(), load_type, url,

Powered by Google App Engine
This is Rietveld 408576698