summaryrefslogtreecommitdiffstats
path: root/content/worker
diff options
context:
space:
mode:
authorterry@google.com <terry@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-17 15:55:16 +0000
committerterry@google.com <terry@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-17 15:55:16 +0000
commit412caade87d5b8dae539b4f3b8a8547fb62ee2fc (patch)
tree1aeec12e48bef92e3c3150c457c14af69d4041af /content/worker
parent640bf44aa16d9401711b113b02983a2545f642af (diff)
downloadchromium_src-412caade87d5b8dae539b4f3b8a8547fb62ee2fc.zip
chromium_src-412caade87d5b8dae539b4f3b8a8547fb62ee2fc.tar.gz
chromium_src-412caade87d5b8dae539b4f3b8a8547fb62ee2fc.tar.bz2
merged 1908
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264526 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/worker')
-rw-r--r--content/worker/worker_webkitplatformsupport_impl.cc6
-rw-r--r--content/worker/worker_webkitplatformsupport_impl.h2
2 files changed, 8 insertions, 0 deletions
diff --git a/content/worker/worker_webkitplatformsupport_impl.cc b/content/worker/worker_webkitplatformsupport_impl.cc
index 3a57f94..e078b2a 100644
--- a/content/worker/worker_webkitplatformsupport_impl.cc
+++ b/content/worker/worker_webkitplatformsupport_impl.cc
@@ -242,6 +242,12 @@ WorkerWebKitPlatformSupportImpl::supportsJavaScriptMIMEType(const WebString&) {
}
WebMimeRegistry::SupportsType
+WorkerWebKitPlatformSupportImpl::supportsDartMIMEType(const WebString&) {
+ NOTREACHED();
+ return WebMimeRegistry::IsSupported;
+}
+
+WebMimeRegistry::SupportsType
WorkerWebKitPlatformSupportImpl::supportsMediaMIMEType(
const WebString&, const WebString&, const WebString&) {
NOTREACHED();
diff --git a/content/worker/worker_webkitplatformsupport_impl.h b/content/worker/worker_webkitplatformsupport_impl.h
index 9fa56d4..f7a9cc5 100644
--- a/content/worker/worker_webkitplatformsupport_impl.h
+++ b/content/worker/worker_webkitplatformsupport_impl.h
@@ -83,6 +83,8 @@ class WorkerWebKitPlatformSupportImpl : public BlinkPlatformImpl,
const blink::WebString&);
virtual blink::WebMimeRegistry::SupportsType supportsJavaScriptMIMEType(
const blink::WebString&);
+ virtual blink::WebMimeRegistry::SupportsType supportsDartMIMEType(
+ const WebKit::WebString&);
virtual blink::WebMimeRegistry::SupportsType supportsMediaMIMEType(
const blink::WebString&,
const blink::WebString&,