[GTK] MHTML files not being loaded due to reported mime type not supported
authormario@webkit.org <mario@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Jul 2012 10:59:48 +0000 (10:59 +0000)
committermario@webkit.org <mario@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Jul 2012 10:59:48 +0000 (10:59 +0000)
commit90433934a1d9ec9ffad69d4a565133ac9be4ba33
tree01449c009b5e60c131d4d2863b0cc7167b16bfa6
parent6055b775f92f7f2f35aaf898dba9f088882362fc
[GTK] MHTML files not being loaded due to reported mime type not supported
https://bugs.webkit.org/show_bug.cgi?id=89978

Reviewed by Carlos Garcia Campos.

Source/WebCore:

Make 'message/rfc822' a supported MIME type for MHTML files in GTK.

* loader/MainResourceLoader.cpp:
(WebCore::MainResourceLoader::continueAfterContentPolicy): Add
'message/rfc822' to the list of MIME types to be considered to
avoid them bypasing cross-domain security checks, only for GTK.
* loader/archive/ArchiveFactory.cpp:
(WebCore::archiveMIMETypes): Add 'message/rfc822' to the list of
supported MIME types when MHTML support is enabled in GTK.

LayoutTests:

Move expectations for MHTML tests out of chromium's specific directory.

* mhtml/multi_frames_binary-expected.txt: Renamed from LayoutTests/platform/chromium/mhtml/multi_frames_binary-expected.txt.
* mhtml/multi_frames_ie-expected.txt: Renamed from LayoutTests/platform/chromium/mhtml/multi_frames_ie-expected.txt.
* mhtml/multi_frames_unmht-expected.txt: Renamed from LayoutTests/platform/chromium/mhtml/multi_frames_unmht-expected.txt.
* mhtml/page_with_css_and_js_ie-expected.txt: Renamed from LayoutTests/platform/chromium/mhtml/page_with_css_and_js_ie-expected.txt.
* mhtml/page_with_css_and_js_unmht-expected.txt: Renamed from LayoutTests/platform/chromium/mhtml/page_with_css_and_js_unmht-expected.txt.
* mhtml/page_with_image_ie-expected.txt: Renamed from LayoutTests/platform/chromium/mhtml/page_with_image_ie-expected.txt.
* mhtml/page_with_image_unmht-expected.txt: Renamed from LayoutTests/platform/chromium/mhtml/page_with_image_unmht-expected.txt.
* mhtml/simple_page_ie-expected.txt: Renamed from LayoutTests/platform/chromium/mhtml/simple_page_ie-expected.txt.
* mhtml/simple_page_unmht-expected.txt: Renamed from LayoutTests/platform/chromium/mhtml/simple_page_unmht-expected.txt.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@123088 268f45cc-cd09-0410-ab3c-d52691b4dbfc
13 files changed:
LayoutTests/ChangeLog
LayoutTests/mhtml/multi_frames_binary-expected.txt [moved from LayoutTests/platform/chromium/mhtml/multi_frames_binary-expected.txt with 100% similarity]
LayoutTests/mhtml/multi_frames_ie-expected.txt [moved from LayoutTests/platform/chromium/mhtml/multi_frames_ie-expected.txt with 100% similarity]
LayoutTests/mhtml/multi_frames_unmht-expected.txt [moved from LayoutTests/platform/chromium/mhtml/multi_frames_unmht-expected.txt with 100% similarity]
LayoutTests/mhtml/page_with_css_and_js_ie-expected.txt [moved from LayoutTests/platform/chromium/mhtml/page_with_css_and_js_ie-expected.txt with 100% similarity]
LayoutTests/mhtml/page_with_css_and_js_unmht-expected.txt [moved from LayoutTests/platform/chromium/mhtml/page_with_css_and_js_unmht-expected.txt with 100% similarity]
LayoutTests/mhtml/page_with_image_ie-expected.txt [moved from LayoutTests/platform/chromium/mhtml/page_with_image_ie-expected.txt with 100% similarity]
LayoutTests/mhtml/page_with_image_unmht-expected.txt [moved from LayoutTests/platform/chromium/mhtml/page_with_image_unmht-expected.txt with 100% similarity]
LayoutTests/mhtml/simple_page_ie-expected.txt [moved from LayoutTests/platform/chromium/mhtml/simple_page_ie-expected.txt with 100% similarity]
LayoutTests/mhtml/simple_page_unmht-expected.txt [moved from LayoutTests/platform/chromium/mhtml/simple_page_unmht-expected.txt with 100% similarity]
Source/WebCore/ChangeLog
Source/WebCore/loader/MainResourceLoader.cpp
Source/WebCore/loader/archive/ArchiveFactory.cpp