summaryrefslogtreecommitdiffstats
path: root/webkit/glue/media/buffered_data_source.cc
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-18 00:49:42 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-18 00:49:42 +0000
commitc69157c1419f70ed44d393ca0cd098e77166c5d0 (patch)
tree345dae1aed000017ab7c15ce3799a4df02ae743c /webkit/glue/media/buffered_data_source.cc
parenta51b060edcd1695b240c96b0b7d3d4a25995303e (diff)
downloadchromium_src-c69157c1419f70ed44d393ca0cd098e77166c5d0.zip
chromium_src-c69157c1419f70ed44d393ca0cd098e77166c5d0.tar.gz
chromium_src-c69157c1419f70ed44d393ca0cd098e77166c5d0.tar.bz2
Remove whiltelist checks for protocol for <audio> and <video>
BUG=22152 Allow <audio> and <video> to request urls with protocol not limited to file, http and https. Review URL: http://codereview.chromium.org/212011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26532 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/media/buffered_data_source.cc')
-rw-r--r--webkit/glue/media/buffered_data_source.cc21
1 files changed, 0 insertions, 21 deletions
diff --git a/webkit/glue/media/buffered_data_source.cc b/webkit/glue/media/buffered_data_source.cc
index f081f04..1267d59 100644
--- a/webkit/glue/media/buffered_data_source.cc
+++ b/webkit/glue/media/buffered_data_source.cc
@@ -56,14 +56,6 @@ const int kReadTrials = 3;
// of FFmpeg.
const int kInitialReadBufferSize = 32768;
-// A helper method that accepts only HTTP, HTTPS and FILE protocol.
-// TODO(hclam): Support also FTP protocol.
-bool IsSchemeSupported(const GURL& url) {
- return url.SchemeIs(kHttpScheme) ||
- url.SchemeIs(kHttpsScheme) ||
- url.SchemeIsFile();
-}
-
} // namespace
namespace webkit_glue {
@@ -213,13 +205,6 @@ bool BufferedResourceLoader::OnReceivedRedirect(
// In this case we shouldn't do anything.
if (!start_callback_.get())
return true;
-
- // If we got redirected to an unsupported protocol then stop.
- if (!IsSchemeSupported(new_url)) {
- DoneStart(net::ERR_ADDRESS_INVALID);
- Stop();
- }
-
return true;
}
@@ -512,12 +497,6 @@ void BufferedDataSource::Initialize(const std::string& url,
// Saves the url.
url_ = GURL(url);
- if (!IsSchemeSupported(url_)) {
- host()->SetError(media::PIPELINE_ERROR_NETWORK);
- DoneInitialization();
- return;
- }
-
media_format_.SetAsString(media::MediaFormat::kMimeType,
media::mime_type::kApplicationOctetStream);
media_format_.SetAsString(media::MediaFormat::kURL, url);