summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authoracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-10 23:24:34 +0000
committeracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-10 23:24:34 +0000
commit132dd57cd2eb09f57cbd68e853ffe12201f562b6 (patch)
tree6e5102495bc167857a1134abc5288454bc8754ed /webkit
parent5d69172cffce892ccca6dbd98e41cdfae3b4f285 (diff)
downloadchromium_src-132dd57cd2eb09f57cbd68e853ffe12201f562b6.zip
chromium_src-132dd57cd2eb09f57cbd68e853ffe12201f562b6.tar.gz
chromium_src-132dd57cd2eb09f57cbd68e853ffe12201f562b6.tar.bz2
Disable 'Save Video As' option for MediaSource and MediaStream URLs.
BUG=141906 TEST=Manual tested w/ normal & Media Source videos. Review URL: https://chromiumcodereview.appspot.com/10825303 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151151 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/media/webmediaplayer_impl.cc5
-rw-r--r--webkit/media/webmediaplayer_impl.h1
2 files changed, 5 insertions, 1 deletions
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc
index 0bac004..aba3e71 100644
--- a/webkit/media/webmediaplayer_impl.cc
+++ b/webkit/media/webmediaplayer_impl.cc
@@ -131,6 +131,7 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
audio_source_provider_(audio_source_provider),
audio_renderer_sink_(audio_renderer_sink),
is_local_source_(false),
+ supports_save_(true),
decryptor_(proxy_.get(), client, frame) {
media_log_->AddEvent(
media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED));
@@ -235,6 +236,7 @@ void WebMediaPlayerImpl::load(const WebKit::WebURL& url, CORSMode cors_mode) {
if (BuildMediaStreamCollection(url, media_stream_client_,
message_loop_factory_.get(),
filter_collection_.get())) {
+ supports_save_ = false;
StartPipeline();
return;
}
@@ -244,6 +246,7 @@ void WebMediaPlayerImpl::load(const WebKit::WebURL& url, CORSMode cors_mode) {
message_loop_factory_.get(),
filter_collection_.get(),
&decryptor_)) {
+ supports_save_ = false;
StartPipeline();
return;
}
@@ -303,7 +306,7 @@ bool WebMediaPlayerImpl::supportsFullscreen() const {
bool WebMediaPlayerImpl::supportsSave() const {
DCHECK_EQ(main_loop_, MessageLoop::current());
- return true;
+ return supports_save_;
}
void WebMediaPlayerImpl::seek(float seconds) {
diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h
index d045faf..d09a961 100644
--- a/webkit/media/webmediaplayer_impl.h
+++ b/webkit/media/webmediaplayer_impl.h
@@ -336,6 +336,7 @@ class WebMediaPlayerImpl
scoped_refptr<media::AudioRendererSink> audio_renderer_sink_;
bool is_local_source_;
+ bool supports_save_;
// The decryptor that manages decryption keys and decrypts encrypted frames.
ProxyDecryptor decryptor_;