Added a method to detect all supported "image/*" MIME types

net/base/mime_util.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 <algorithm>
 #include <iterator>
 #include <map>
 #include <string>
 
 #include "base/containers/hash_tables.h"
@@ skipping 64 matching lines @@
 
   bool GetMimeTypeFromFile(const base::FilePath& file_path,
                            std::string* mime_type) const;
 
   bool GetWellKnownMimeTypeFromExtension(const base::FilePath::StringType& ext,
                                          std::string* mime_type) const;
 
   bool IsSupportedImageMimeType(const std::string& mime_type) const;
   bool IsSupportedMediaMimeType(const std::string& mime_type) const;
   bool IsSupportedNonImageMimeType(const std::string& mime_type) const;
+  bool IsSupportedImagePrefixedMimeType(const std::string& mime_type) const;
   bool IsUnsupportedTextMimeType(const std::string& mime_type) const;
   bool IsSupportedJavascriptMimeType(const std::string& mime_type) const;
 
   bool IsSupportedMimeType(const std::string& mime_type) const;
 
   bool MatchesMimeType(const std::string &mime_type_pattern,
                        const std::string &mime_type) const;
 
   bool ParseMimeTypeWithoutParameter(const std::string& type_string,
                                      std::string* top_level_type,
@@ skipping 625 matching lines @@
   return javascript_map_.find(mime_type) != javascript_map_.end();
 }
 
 // Mirrors WebViewImpl::CanShowMIMEType()
 bool MimeUtil::IsSupportedMimeType(const std::string& mime_type) const {
   return (mime_type.compare(0, 6, "image/") == 0 &&
           IsSupportedImageMimeType(mime_type)) ||
          IsSupportedNonImageMimeType(mime_type);
 }
 
+bool MimeUtil::IsSupportedImagePrefixedMimeType(
+    const std::string& mime_type) const {
+  return (mime_type.compare(0, 6, "image/") == 0 &&
+          (IsSupportedImageMimeType(mime_type) ||
+           IsSupportedNonImageMimeType(mime_type)));

[Ryan Sleevi, 2014/08/22 23:08:35]

This doesn't really make sense to me.

[Ryan Sleevi, 2014/08/23 05:09:45]

What I specifically mean is that you check for the image prefix, but then allow
a non-image mime type.

That is, checking for image/nonimagetype is, well, weird.

I realize that <picture> may itself be weird (hence the comment about clean via
messy).

+}
 // Tests for MIME parameter equality. Each parameter in the |mime_type_pattern|
 // must be matched by a parameter in the |mime_type|. If there are no
 // parameters in the pattern, the match is a success.
 bool MatchesMimeTypeParameters(const std::string& mime_type_pattern,
                                const std::string& mime_type) {
   const std::string::size_type semicolon = mime_type_pattern.find(';');
   const std::string::size_type test_semicolon = mime_type.find(';');
   if (semicolon != std::string::npos) {
     if (test_semicolon == std::string::npos)
       return false;
@@ skipping 333 matching lines @@
 }
 
 bool IsSupportedMediaMimeType(const std::string& mime_type) {
   return g_mime_util.Get().IsSupportedMediaMimeType(mime_type);
 }
 
 bool IsSupportedNonImageMimeType(const std::string& mime_type) {
   return g_mime_util.Get().IsSupportedNonImageMimeType(mime_type);
 }
 
+bool IsSupportedImagePrefixedMimeType(const std::string& mime_type) {
+  return g_mime_util.Get().IsSupportedImagePrefixedMimeType(mime_type);
+}
+
 bool IsUnsupportedTextMimeType(const std::string& mime_type) {
   return g_mime_util.Get().IsUnsupportedTextMimeType(mime_type);
 }
 
 bool IsSupportedJavascriptMimeType(const std::string& mime_type) {
   return g_mime_util.Get().IsSupportedJavascriptMimeType(mime_type);
 }
 
 bool IsSupportedMimeType(const std::string& mime_type) {
   return g_mime_util.Get().IsSupportedMimeType(mime_type);
@@ skipping 266 matching lines @@
   post_data->append("\r\n" + value + "\r\n");
 }
 
 void AddMultipartFinalDelimiterForUpload(const std::string& mime_boundary,
                                          std::string* post_data) {
   DCHECK(post_data);
   post_data->append("--" + mime_boundary + "--\r\n");
 }
 
 }  // namespace net