From 8070f78451ce8c33bcac19e6261aaefa2dc260c6 Mon Sep 17 00:00:00 2001 From: Shouqun Liu Date: Fri, 30 Aug 2013 13:45:33 +0800 Subject: [PATCH] Fix the issue of ContentShell can't play video with file scheme. MediaInfoLoader checks single security origin and CROS access, but for media resources with file protocol, it always returns false, which disables local video playback. BUG=234710 TEST=video with file protocol Review URL: https://chromiumcodereview.appspot.com/19324002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211967 0039d316-1c4b-4281-b951-d872f2087c98 --- content/renderer/media/android/media_info_loader.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/renderer/media/android/media_info_loader.cc b/content/renderer/media/android/media_info_loader.cc index 61b794d48ef85..cb01324566421 100644 --- a/content/renderer/media/android/media_info_loader.cc +++ b/content/renderer/media/android/media_info_loader.cc @@ -110,7 +110,7 @@ void MediaInfoLoader::didReceiveResponse( "Unknown") << " " << response.httpStatusCode(); DCHECK(active_loader_.get()); - if (response.httpStatusCode() == kHttpOK) { + if (response.httpStatusCode() == kHttpOK || url_.SchemeIsFile()) { DidBecomeReady(kOk); return; }