Implemented rest of webkit api/glue code needed for HTML5 media canPlayType().

webkit/glue/simple_webmimeregistry_impl.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.  Use of this
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
 #include "webkit/glue/simple_webmimeregistry_impl.h"
 
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "net/base/mime_util.h"
 #include "webkit/api/public/WebString.h"
 #include "webkit/glue/glue_util.h"
 #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(
     const WebString& file_extension) {
   std::string mime_type;
   net::GetMimeTypeFromExtension(
       WebStringToFilePathString(file_extension), &mime_type);
   return ASCIIToUTF16(mime_type);
 }
 
 WebString SimpleWebMimeRegistryImpl::mimeTypeFromFile(
     const WebString& file_path) {
   std::string mime_type;
   net::GetMimeTypeFromFile(
       FilePath(WebStringToFilePathString(file_path)), &mime_type);
   return ASCIIToUTF16(mime_type);
 }
 
 WebString SimpleWebMimeRegistryImpl::preferredExtensionForMIMEType(
     const WebString& mime_type) {
   FilePath::StringType file_extension;
   net::GetPreferredExtensionForMimeType(UTF16ToASCII(mime_type),
                                         &file_extension);
   return FilePathStringToWebString(file_extension);
 }
 
 }  // namespace webkit_glue