summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit')
-rw-r--r--webkit/api/public/WebMimeRegistry.h17
-rw-r--r--webkit/api/src/ChromiumBridge.cpp9
-rw-r--r--webkit/api/src/WebMediaPlayerClientImpl.cpp15
-rw-r--r--webkit/glue/simple_webmimeregistry_impl.cc36
-rw-r--r--webkit/glue/simple_webmimeregistry_impl.h12
5 files changed, 62 insertions, 27 deletions
diff --git a/webkit/api/public/WebMimeRegistry.h b/webkit/api/public/WebMimeRegistry.h
index 100331f..8707f3f 100644
--- a/webkit/api/public/WebMimeRegistry.h
+++ b/webkit/api/public/WebMimeRegistry.h
@@ -1,10 +1,10 @@
/*
* Copyright (C) 2009 Google Inc. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
- *
+ *
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
@@ -14,7 +14,7 @@
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -38,10 +38,13 @@ namespace WebKit {
class WebMimeRegistry {
public:
- virtual bool supportsImageMIMEType(const WebString& mimeType) = 0;
- virtual bool supportsJavaScriptMIMEType(const WebString& mimeType) = 0;
- virtual bool supportsMediaMIMEType(const WebString& mimeType) = 0;
- virtual bool supportsNonImageMIMEType(const WebString& mimeType) = 0;
+ enum SupportsType { IsNotSupported, IsSupported, MayBeSupported };
+
+ virtual SupportsType supportsImageMIMEType(const WebString& mimeType) = 0;
+ virtual SupportsType supportsJavaScriptMIMEType(const WebString& mimeType) = 0;
+ virtual SupportsType supportsMediaMIMEType(const WebString& mimeType,
+ const WebString& codecs) = 0;
+ virtual SupportsType supportsNonImageMIMEType(const WebString& mimeType) = 0;
virtual WebString mimeTypeForExtension(const WebString& fileExtension) = 0;
virtual WebString mimeTypeFromFile(const WebString& filePath) = 0;
diff --git a/webkit/api/src/ChromiumBridge.cpp b/webkit/api/src/ChromiumBridge.cpp
index f8d2e99..93ac857 100644
--- a/webkit/api/src/ChromiumBridge.cpp
+++ b/webkit/api/src/ChromiumBridge.cpp
@@ -196,17 +196,20 @@ bool ChromiumBridge::layoutTestMode()
bool ChromiumBridge::isSupportedImageMIMEType(const String& mimeType)
{
- return webKitClient()->mimeRegistry()->supportsImageMIMEType(mimeType);
+ return webKitClient()->mimeRegistry()->supportsImageMIMEType(mimeType)
+ != WebMimeRegistry::IsNotSupported;
}
bool ChromiumBridge::isSupportedJavaScriptMIMEType(const String& mimeType)
{
- return webKitClient()->mimeRegistry()->supportsJavaScriptMIMEType(mimeType);
+ return webKitClient()->mimeRegistry()->supportsJavaScriptMIMEType(mimeType)
+ != WebMimeRegistry::IsNotSupported;
}
bool ChromiumBridge::isSupportedNonImageMIMEType(const String& mimeType)
{
- return webKitClient()->mimeRegistry()->supportsNonImageMIMEType(mimeType);
+ return webKitClient()->mimeRegistry()->supportsNonImageMIMEType(mimeType)
+ != WebMimeRegistry::IsNotSupported;
}
String ChromiumBridge::mimeTypeForExtension(const String& extension)
diff --git a/webkit/api/src/WebMediaPlayerClientImpl.cpp b/webkit/api/src/WebMediaPlayerClientImpl.cpp
index 0451ad8..d26bd16 100644
--- a/webkit/api/src/WebMediaPlayerClientImpl.cpp
+++ b/webkit/api/src/WebMediaPlayerClientImpl.cpp
@@ -377,10 +377,17 @@ void WebMediaPlayerClientImpl::getSupportedTypes(HashSet<String>& supportedTypes
MediaPlayer::SupportsType WebMediaPlayerClientImpl::supportsType(const String& type,
const String& codecs)
{
- // FIXME: respect codecs, now we only check for mime-type.
- if (webKitClient()->mimeRegistry()->supportsMediaMIMEType(type))
- return MediaPlayer::IsSupported;
- return MediaPlayer::IsNotSupported;
+ WebMimeRegistry::SupportsType supportsType =
+ webKitClient()->mimeRegistry()->supportsMediaMIMEType(type, codecs);
+
+ switch (supportsType) {
+ case WebMimeRegistry::IsNotSupported:
+ return MediaPlayer::IsNotSupported;
+ case WebMimeRegistry::IsSupported:
+ return MediaPlayer::IsSupported;
+ case WebMimeRegistry::MayBeSupported:
+ return MediaPlayer::MayBeSupported;
+ }
}
WebMediaPlayerClientImpl::WebMediaPlayerClientImpl()
diff --git a/webkit/glue/simple_webmimeregistry_impl.cc b/webkit/glue/simple_webmimeregistry_impl.cc
index 95c39a1..29296ff 100644
--- a/webkit/glue/simple_webmimeregistry_impl.cc
+++ b/webkit/glue/simple_webmimeregistry_impl.cc
@@ -12,27 +12,45 @@
#include "webkit/glue/webkit_glue.h"
using WebKit::WebString;
+using WebKit::WebMimeRegistry;
namespace webkit_glue {
-bool SimpleWebMimeRegistryImpl::supportsImageMIMEType(
+WebMimeRegistry::SupportsType SimpleWebMimeRegistryImpl::supportsImageMIMEType(
const WebString& mime_type) {
- return net::IsSupportedImageMimeType(UTF16ToASCII(mime_type).c_str());
+ if (!net::IsSupportedImageMimeType(UTF16ToASCII(mime_type).c_str()))
+ return WebMimeRegistry::IsNotSupported;
+ return WebMimeRegistry::IsSupported;
}
-bool SimpleWebMimeRegistryImpl::supportsJavaScriptMIMEType(
+WebMimeRegistry::SupportsType SimpleWebMimeRegistryImpl::supportsJavaScriptMIMEType(
const WebString& mime_type) {
- return net::IsSupportedJavascriptMimeType(UTF16ToASCII(mime_type).c_str());
+ if (!net::IsSupportedJavascriptMimeType(UTF16ToASCII(mime_type).c_str()))
+ return WebMimeRegistry::IsNotSupported;
+ return WebMimeRegistry::IsSupported;
}
-bool SimpleWebMimeRegistryImpl::supportsMediaMIMEType(
- const WebString& mime_type) {
- return net::IsSupportedMediaMimeType(UTF16ToASCII(mime_type).c_str());
+WebMimeRegistry::SupportsType SimpleWebMimeRegistryImpl::supportsMediaMIMEType(
+ const WebString& mime_type, const WebString& codecs) {
+ // Not supporting the container is a flat-out no.
+ if (!net::IsSupportedMediaMimeType(UTF16ToASCII(mime_type).c_str()))
+ return IsNotSupported;
+
+ // If we don't recognize the codec, it's possible we support it.
+ std::vector<std::string> parsed_codecs;
+ net::ParseCodecString(UTF16ToASCII(codecs).c_str(), &parsed_codecs);
+ if (!net::AreSupportedMediaCodecs(parsed_codecs))
+ return MayBeSupported;
+
+ // Otherwise we have a perfect match.
+ return IsSupported;
}
-bool SimpleWebMimeRegistryImpl::supportsNonImageMIMEType(
+WebMimeRegistry::SupportsType SimpleWebMimeRegistryImpl::supportsNonImageMIMEType(
const WebString& mime_type) {
- return net::IsSupportedNonImageMimeType(UTF16ToASCII(mime_type).c_str());
+ if (!net::IsSupportedNonImageMimeType(UTF16ToASCII(mime_type).c_str()))
+ return WebMimeRegistry::IsNotSupported;
+ return WebMimeRegistry::IsSupported;
}
WebString SimpleWebMimeRegistryImpl::mimeTypeForExtension(
diff --git a/webkit/glue/simple_webmimeregistry_impl.h b/webkit/glue/simple_webmimeregistry_impl.h
index c783ebd..003a9f4 100644
--- a/webkit/glue/simple_webmimeregistry_impl.h
+++ b/webkit/glue/simple_webmimeregistry_impl.h
@@ -12,10 +12,14 @@ namespace webkit_glue {
class SimpleWebMimeRegistryImpl : public WebKit::WebMimeRegistry {
public:
// WebMimeRegistry methods:
- virtual bool supportsImageMIMEType(const WebKit::WebString&);
- virtual bool supportsJavaScriptMIMEType(const WebKit::WebString&);
- virtual bool supportsMediaMIMEType(const WebKit::WebString&);
- virtual bool supportsNonImageMIMEType(const WebKit::WebString&);
+ virtual WebKit::WebMimeRegistry::SupportsType supportsImageMIMEType(
+ const WebKit::WebString&);
+ virtual WebKit::WebMimeRegistry::SupportsType supportsJavaScriptMIMEType(
+ const WebKit::WebString&);
+ virtual WebKit::WebMimeRegistry::SupportsType supportsMediaMIMEType(
+ const WebKit::WebString&, const WebKit::WebString&);
+ virtual WebKit::WebMimeRegistry::SupportsType supportsNonImageMIMEType(
+ const WebKit::WebString&);
virtual WebKit::WebString mimeTypeForExtension(const WebKit::WebString&);
virtual WebKit::WebString mimeTypeFromFile(const WebKit::WebString&);
virtual WebKit::WebString preferredExtensionForMIMEType(
generated by cgit v1.1 at 2025-01-21 05:08:44 +0000