summaryrefslogtreecommitdiffstats
path: root/content/worker
diff options
context:
space:
mode:
authorxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-26 14:50:37 +0000
committerxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-26 14:50:37 +0000
commit5779de133407c9ca899a67df2450cf41bd620d41 (patch)
treec5a7eeaf22b2c8e5373e5d241465cd96bee747a0 /content/worker
parent220ca7cf6e6374b9dd0423f0afe6b2520df70f9d (diff)
downloadchromium_src-5779de133407c9ca899a67df2450cf41bd620d41.zip
chromium_src-5779de133407c9ca899a67df2450cf41bd620d41.tar.gz
chromium_src-5779de133407c9ca899a67df2450cf41bd620d41.tar.bz2
Encrypted Media: Add supportsEncryptedMediaMIMEType().
This is necessary to implement MediaKeys::isTypeSupported(). The Blink side change is at: https://codereview.chromium.org/170783017 BUG=224786 TEST=Tested manually with Blink side change. EncryptedMediaIsTypeSupportedTest will be updated after this CL and the Blink side CL are landed. Review URL: https://codereview.chromium.org/173293002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253451 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/worker')
-rw-r--r--content/worker/worker_webkitplatformsupport_impl.cc8
-rw-r--r--content/worker/worker_webkitplatformsupport_impl.h3
2 files changed, 11 insertions, 0 deletions
diff --git a/content/worker/worker_webkitplatformsupport_impl.cc b/content/worker/worker_webkitplatformsupport_impl.cc
index a63c70f..cb4d855 100644
--- a/content/worker/worker_webkitplatformsupport_impl.cc
+++ b/content/worker/worker_webkitplatformsupport_impl.cc
@@ -252,6 +252,14 @@ bool WorkerWebKitPlatformSupportImpl::supportsMediaSourceMIMEType(
return false;
}
+bool WorkerWebKitPlatformSupportImpl::supportsEncryptedMediaMIMEType(
+ const blink::WebString& key_system,
+ const blink::WebString& mime_type,
+ const blink::WebString& codecs) {
+ NOTREACHED();
+ return false;
+}
+
WebMimeRegistry::SupportsType
WorkerWebKitPlatformSupportImpl::supportsNonImageMIMEType(
const WebString&) {
diff --git a/content/worker/worker_webkitplatformsupport_impl.h b/content/worker/worker_webkitplatformsupport_impl.h
index 2ce9b42..d6f711c 100644
--- a/content/worker/worker_webkitplatformsupport_impl.h
+++ b/content/worker/worker_webkitplatformsupport_impl.h
@@ -89,6 +89,9 @@ class WorkerWebKitPlatformSupportImpl : public WebKitPlatformSupportImpl,
virtual bool supportsMediaSourceMIMEType(
const blink::WebString&,
const blink::WebString&);
+ virtual bool supportsEncryptedMediaMIMEType(const blink::WebString&,
+ const blink::WebString&,
+ const blink::WebString&);
virtual blink::WebMimeRegistry::SupportsType supportsNonImageMIMEType(
const blink::WebString&);
virtual blink::WebString mimeTypeForExtension(const blink::WebString&);