Initial implementation of Encrypted Media Extensions in Chrome.

webkit/glue/simple_webmimeregistry_impl.cc

 // Copyright (c) 2012 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 "base/utf_string_conversions.h"
 #include "net/base/mime_util.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "webkit/glue/webkit_glue.h"
+#include "webkit/media/supported_key_systems.h"
 
 using WebKit::WebString;
 using WebKit::WebMimeRegistry;
+using webkit_media::SupportedKeySystems;
 
 namespace {
 
 // Convert a WebString to ASCII, falling back on an empty string in the case
 // of a non-ASCII string.
 std::string ToASCIIOrEmpty(const WebString& string) {
   return IsStringASCII(string) ? UTF16ToASCII(string) : std::string();
 }
 
 }  // namespace
@@ skipping 12 matching lines @@
       WebMimeRegistry::IsSupported : WebMimeRegistry::IsNotSupported;
 }
 
 WebMimeRegistry::SupportsType
     SimpleWebMimeRegistryImpl::supportsJavaScriptMIMEType(
     const WebString& mime_type) {
   return net::IsSupportedJavascriptMimeType(ToASCIIOrEmpty(mime_type)) ?
       WebMimeRegistry::IsSupported : WebMimeRegistry::IsNotSupported;
 }
 
+// When debugging layout tests failures in the test shell,
+// see TestShellWebMimeRegistryImpl.
+WebMimeRegistry::SupportsType SimpleWebMimeRegistryImpl::supportsMediaMIMEType(
+    const WebString& mime_type, const WebString& codecs) {
+  return supportsMediaMIMEType(mime_type, codecs, WebString());
+}
+
 WebMimeRegistry::SupportsType SimpleWebMimeRegistryImpl::supportsMediaMIMEType(
     const WebString& mime_type,
-    const WebString& codecs) {
+    const WebString& codecs,
+    const WebString& keySystem) {

[scherkus (not reviewing), 2012/04/12 20:18:41]

key_system

[ddorwin, 2012/04/12 23:41:23]

Done.

   // Not supporting the container is a flat-out no.
   if (!net::IsSupportedMediaMimeType(ToASCIIOrEmpty(mime_type)))
     return IsNotSupported;
 
+  if (!keySystem.isEmpty()) {
+    // Check whether the key system is supported with the mime_type and codecs.
+
+    // Not supporting the key system is a flat-out no.
+    if (!SupportedKeySystems::isKeySystemSupported(keySystem))
+      return IsNotSupported;
+
+    std::vector<std::string> strict_codecs;
+    net::ParseCodecString(ToASCIIOrEmpty(codecs).c_str(),

[scherkus (not reviewing), 2012/04/12 20:18:41]

does this need to be c_str()? the calling function accepts std::string and
ToASCIIOrEmpty() also returns an std::string

[ddorwin, 2012/04/12 23:41:23]

Done.

+                          &strict_codecs,
+                          false);
+
+    if (!SupportedKeySystems::IsSupportedKeySystemWithMediaMimeType(
+        ToASCIIOrEmpty(mime_type).c_str(),

[scherkus (not reviewing), 2012/04/12 20:18:41]

ditto here

[ddorwin, 2012/04/12 23:41:23]

Done.

+        strict_codecs,
+        ToASCIIOrEmpty(keySystem).c_str()))
+      return IsNotSupported;
+
+    // Continue processing the mime_type and codecs.
+  }
+
   // Check list of strict codecs to see if it is supported.
   if (net::IsStrictMediaMimeType(ToASCIIOrEmpty(mime_type))) {
     // We support the container, but no codecs were specified.
     if (codecs.isNull())
       return MayBeSupported;
 
     // Check if the codecs are a perfect match.
     std::vector<std::string> strict_codecs;
     net::ParseCodecString(ToASCIIOrEmpty(codecs).c_str(), &strict_codecs,
                           false);
@@ skipping 48 matching lines @@
 
 WebString SimpleWebMimeRegistryImpl::preferredExtensionForMIMEType(
     const WebString& mime_type) {
   FilePath::StringType file_extension;
   net::GetPreferredExtensionForMimeType(ToASCIIOrEmpty(mime_type),
                                         &file_extension);
   return FilePathStringToWebString(file_extension);
 }
 
 }  // namespace webkit_glue