diff options
author | servolk <servolk@chromium.org> | 2015-12-01 08:37:40 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-12-01 16:38:49 +0000 |
commit | dcd13965d92665dc93e38d23ffdd0f7802d548e2 (patch) | |
tree | 08ad3dc4de001e1883785a65a6b9d7a3a25f974b /components | |
parent | d6d82e45bc9d2c8c043a5446361c6b8701532328 (diff) | |
download | chromium_src-dcd13965d92665dc93e38d23ffdd0f7802d548e2.zip chromium_src-dcd13965d92665dc93e38d23ffdd0f7802d548e2.tar.gz chromium_src-dcd13965d92665dc93e38d23ffdd0f7802d548e2.tar.bz2 |
Further media mime_util cleanup
Removed MimeUtil::media_map_ by using media_format_map_ instead.
Removed common_media_types/proprietary_media_types, since they are duplicated in format_codec_mappings.
Added a new COMMON/PROPRIETARY flag to each media format mapping instead.
BUG=461012
Review URL: https://codereview.chromium.org/1472443003
Cr-Commit-Position: refs/heads/master@{#362434}
Diffstat (limited to 'components')
-rw-r--r-- | components/html_viewer/web_mime_registry_impl.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/components/html_viewer/web_mime_registry_impl.cc b/components/html_viewer/web_mime_registry_impl.cc index 0797511..c85656a 100644 --- a/components/html_viewer/web_mime_registry_impl.cc +++ b/components/html_viewer/web_mime_registry_impl.cc @@ -65,15 +65,11 @@ blink::WebMimeRegistry::SupportsType WebMimeRegistryImpl::supportsMediaMIMEType( const blink::WebString& codecs, const blink::WebString& key_system) { const std::string mime_type_ascii = ToASCIIOrEmpty(mime_type); - // Not supporting the container is a flat-out no. - if (!media::IsSupportedMediaMimeType(mime_type_ascii)) - return IsNotSupported; // Mojo does not currently support any key systems. if (!key_system.isEmpty()) return IsNotSupported; - // Check that codecs are appropriate for the container type. std::vector<std::string> codec_vector; media::ParseCodecString(ToASCIIOrEmpty(codecs), &codec_vector, false); return static_cast<WebMimeRegistry::SupportsType>( |