diff options
| author | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-27 00:17:04 +0000 |
|---|---|---|
| committer | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-27 00:17:04 +0000 |
| commit | f689da10139d76dd3fb8a0e92d5732324cb2d90c (patch) | |
| tree | 321e3c574032423939e9d0a909c49f1237ae3e13 /content/renderer/media | |
| parent | 500c7bb138ff686dfd395d70f09e4c990b0b69f4 (diff) | |
| download | chromium_src-f689da10139d76dd3fb8a0e92d5732324cb2d90c.zip chromium_src-f689da10139d76dd3fb8a0e92d5732324cb2d90c.tar.gz chromium_src-f689da10139d76dd3fb8a0e92d5732324cb2d90c.tar.bz2 | |
Always mark cross-origin as true for regular media urls
We cannot guarantee that urls will not be redirected when android mediaplayer requests video streams.
Always treat media urls as cross-origin for now.
BUG=334204
Review URL: https://codereview.chromium.org/247573004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266396 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/media')
| -rw-r--r-- | content/renderer/media/android/media_info_loader.h | 4 | ||||
| -rw-r--r-- | content/renderer/media/android/webmediaplayer_android.cc | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/content/renderer/media/android/media_info_loader.h b/content/renderer/media/android/media_info_loader.h index 68e5232..d87b67c 100644 --- a/content/renderer/media/android/media_info_loader.h +++ b/content/renderer/media/android/media_info_loader.h @@ -66,6 +66,10 @@ class CONTENT_EXPORT MediaInfoLoader : private blink::WebURLLoaderClient { // Only valid to call after the loader becomes ready. bool DidPassCORSAccessCheck() const; + void set_single_origin(bool single_origin) { + single_origin_ = single_origin; + } + private: friend class MediaInfoLoaderTest; diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc index 165828c..a725840 100644 --- a/content/renderer/media/android/webmediaplayer_android.cc +++ b/content/renderer/media/android/webmediaplayer_android.cc @@ -219,6 +219,11 @@ void WebMediaPlayerAndroid::load(LoadType load_type, cors_mode, base::Bind(&WebMediaPlayerAndroid::DidLoadMediaInfo, weak_factory_.GetWeakPtr()))); + // TODO(qinmin): The url might be redirected when android media player + // requests the stream. As a result, we cannot guarantee there is only + // a single origin. Remove the following line when b/12573548 is fixed. + // Check http://crbug.com/334204. + info_loader_->set_single_origin(false); info_loader_->Start(frame_); } |