Index: content/renderer/renderer_webkitplatformsupport_impl.cc |
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc |
index ceb6850e3f7a130d417506c591632c510204d96a..1a8da0d8b3993a1a76b97a633cec3966004ee404 100644 |
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc |
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc |
@@ -425,8 +425,7 @@ RendererWebKitPlatformSupportImpl::MimeRegistry::supportsMediaMIMEType( |
std::string key_system_ascii = |
GetUnprefixedKeySystemName(base::UTF16ToASCII(key_system)); |
std::vector<std::string> strict_codecs; |
- bool strip_suffix = !net::IsStrictMediaMimeType(mime_type_ascii); |
- net::ParseCodecString(ToASCIIOrEmpty(codecs), &strict_codecs, strip_suffix); |
+ net::ParseCodecString(ToASCIIOrEmpty(codecs), &strict_codecs, true); |
if (!IsSupportedKeySystemWithMediaMimeType( |
mime_type_ascii, strict_codecs, key_system_ascii)) { |
@@ -441,14 +440,8 @@ RendererWebKitPlatformSupportImpl::MimeRegistry::supportsMediaMIMEType( |
// Check if the codecs are a perfect match. |
std::vector<std::string> strict_codecs; |
net::ParseCodecString(ToASCIIOrEmpty(codecs), &strict_codecs, false); |
- if (net::IsSupportedStrictMediaMimeType(mime_type_ascii, strict_codecs)) |
- return IsSupported; |
- |
- // We support the container, but no codecs were specified. |
- if (codecs.isNull()) |
- return MayBeSupported; |
- |
- return IsNotSupported; |
+ return static_cast<WebMimeRegistry::SupportsType> ( |
acolwell GONE FROM CHROMIUM
2014/06/02 21:22:42
You should add COMPILE_ASSERTS to content/public/c
amogh.bihani
2014/06/03 13:26:12
Done.
|
+ net::IsSupportedStrictMediaMimeType(mime_type_ascii, strict_codecs)); |
} |
// If we don't recognize the codec, it's possible we support it. |