Enabling MHTML.

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.


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=86560

[adamk, 2011-05-24 23:14:31]

LGTM for features_override.gypi.

On Tue, May 24, 2011 at 4:10 PM, <jcivelli@chromium.org> wrote:

> Reviewers: adamk, abarth,
>
> Description:
> 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.
>
>
> Please review this at http://codereview.chromium.org/7064044/
>
> SVN Base: http://git.chromium.org/git/chromium.git@trunk
>
> Affected files:
>  M build/features_override.gypi
>  M net/base/mime_util.cc
>
>
> Index: build/features_override.gypi
> diff --git a/build/features_override.gypi b/build/features_override.gypi
> index
>
1dc65db9078a46e92fb478daf45a7e9821f4f36d..82708ac6ada38a4eedba775f644f79f9d9d85b33
> 100644
> --- a/build/features_override.gypi
> +++ b/build/features_override.gypi
> @@ -41,6 +41,7 @@
>       'ENABLE_METER_TAG=1',
>       'ENABLE_MEDIA_STATISTICS=1',
>       'ENABLE_MEDIA_STREAM=1',
> +      'ENABLE_MHTML=1',
>       'ENABLE_NOTIFICATIONS=1',
>       'ENABLE_OFFLINE_WEB_APPLICATIONS=1',
>       'ENABLE_OPENTYPE_SANITIZER=1',
> Index: net/base/mime_util.cc
> diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
> index
>
51bf9643a3641ba24d0436e2ef04781f820ebf9e..b6aa539429798ce5645c0950c90188f88b79e733
> 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
>
>
>

[abarth-chromium, 2011-05-24 23:36:00]

ok

[commit-bot: I haz the power, 2011-05-25 00:13:47]

Presubmit check for 7064044-1 failed and returned exit status 1.

Running presubmit commit checks ...

** Presubmit ERRORS **
Missing LGTM from an OWNER for: net/base/mime_util.cc

[Jay Civelli, 2011-05-25 00:18:14]

Adding Wan-Teh as I need a network OWNER.

[wtc, 2011-05-25 00:31:49]

LGTM.

http://codereview.chromium.org/7064044/diff/1/net/base/mime_util.cc
File net/base/mime_util.cc (right):

http://codereview.chromium.org/7064044/diff/1/net/base/mime_util.cc#newcode276
net/base/mime_util.cc:276: supported_non_images_types_must_equal_17);
This COMPILE_ASSERT probably should be removed.  As far as
I can tell, the assertion verifies that the arraysize() macro
works correctly, rather than the supported_non_image_types array
must have a certain number of elements.

[abarth-chromium, 2011-05-25 01:20:24]

Marking for commit because this is blocking the WebKit roll.  We can remove the
compile assert in a separate patch.

[commit-bot: I haz the power, 2011-05-25 02:57:43]

Change committed as 86560