diff options
| author | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 02:57:41 +0000 |
|---|---|---|
| committer | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 02:57:41 +0000 |
| commit | 5f0ce949949d47df43553f0d98d17c4885a22a17 (patch) | |
| tree | e82a5a5cdf2c0e75bd8bec4747e0b35be43fb4c8 /net | |
| parent | ad85ea40800741d57a076e78c550b57c21220751 (diff) | |
| download | chromium_src-5f0ce949949d47df43553f0d98d17c4885a22a17.zip chromium_src-5f0ce949949d47df43553f0d98d17c4885a22a17.tar.gz chromium_src-5f0ce949949d47df43553f0d98d17c4885a22a17.tar.bz2 | |
Enabling MHTML.
Enabling MHTML reading on the Chrome side now that the WebKit patch
adding support for MHTML landed in WebKit.
That is necessary for the MHTML layout tests to pass.
BUG=83804
TEST=MHTML layout tests should pass.
Review URL: http://codereview.chromium.org/7064044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/mime_util.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc index 51bf964..b6aa539 100644 --- a/net/base/mime_util.cc +++ b/net/base/mime_util.cc @@ -117,7 +117,8 @@ static const MimeInfo secondary_mappings[] = { { "application/rdf+xml", "rdf" }, { "text/xml", "xsl,xbl" }, { "application/vnd.mozilla.xul+xml", "xul" }, - { "application/x-shockwave-flash", "swf,swl" } + { "application/x-shockwave-flash", "swf,swl" }, + { "multipart/related", "mht,mhtml" } }; static const char* FindMimeType(const MimeInfo* mappings, @@ -266,12 +267,13 @@ static const char* const supported_non_image_types[] = { "application/atom+xml", "application/json", "application/x-x509-user-cert", + "multipart/related", // For MHTML support. "multipart/x-mixed-replace" // Note: ADDING a new type here will probably render it AS HTML. This can // result in cross site scripting. }; -COMPILE_ASSERT(arraysize(supported_non_image_types) == 16, - supported_non_images_types_must_equal_16); +COMPILE_ASSERT(arraysize(supported_non_image_types) == 17, + supported_non_images_types_must_equal_17); // Mozilla 1.8 and WinIE 7 both accept text/javascript and text/ecmascript. // Mozilla 1.8 accepts application/javascript, application/ecmascript, and |