1 diff --git a/ChangeLog b/ChangeLog
2 index 634d2a1..8d2a201 100644
6 +2012-12-26 KwangYong Choi <ky0.choi@samsung.com>
8 + [EFL] Enable MHTML feature
9 + https://bugs.webkit.org/show_bug.cgi?id=xxxxx
11 + Reviewed by NOBODY (OOPS!).
13 + ENABLE_MHTML is now ON for EFL.
15 + * Source/cmake/OptionsEfl.cmake:
17 2012-12-24 Kondapally Kalyan <kalyan.kondapally@intel.com>
19 [EFL [WebGL] GLES2 detection is broken.
20 diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
21 index 046ef14..4ac5387 100644
22 --- a/Source/WebCore/ChangeLog
23 +++ b/Source/WebCore/ChangeLog
25 +2012-12-26 KwangYong Choi <ky0.choi@samsung.com>
27 + [EFL] Enable MHTML feature
28 + https://bugs.webkit.org/show_bug.cgi?id=xxxxx
30 + Reviewed by NOBODY (OOPS!).
32 + Add application/x-mimearchive type to archive mime types.
33 + Add mht and mhtml to extension map.
35 + No new tests. Existing layout tests pass.
37 + * loader/archive/ArchiveFactory.cpp:
38 + (WebCore::archiveMIMETypes):
39 + * platform/efl/MIMETypeRegistryEfl.cpp:
42 2012-12-26 Huang Dongsung <luxtella@company100.net>
44 [TexMap] A Minor optimization of GraphicsLayerTransform.
45 diff --git a/Source/WebCore/loader/archive/ArchiveFactory.cpp b/Source/WebCore/loader/archive/ArchiveFactory.cpp
46 index 4ebb52b..a989154 100644
47 --- a/Source/WebCore/loader/archive/ArchiveFactory.cpp
48 +++ b/Source/WebCore/loader/archive/ArchiveFactory.cpp
49 @@ -70,7 +70,7 @@ static ArchiveMIMETypesMap& archiveMIMETypes()
50 mimeTypes.set("multipart/related", archiveFactoryCreate<MHTMLArchive>);
52 mimeTypes.set("message/rfc822", archiveFactoryCreate<MHTMLArchive>);
54 +#elif PLATFORM(QT) || PLATFORM(EFL)
55 mimeTypes.set("application/x-mimearchive", archiveFactoryCreate<MHTMLArchive>);
58 diff --git a/Source/WebCore/platform/efl/MIMETypeRegistryEfl.cpp b/Source/WebCore/platform/efl/MIMETypeRegistryEfl.cpp
59 index d883e5d..540bb2d 100644
60 --- a/Source/WebCore/platform/efl/MIMETypeRegistryEfl.cpp
61 +++ b/Source/WebCore/platform/efl/MIMETypeRegistryEfl.cpp
62 @@ -51,6 +51,8 @@ static const ExtensionMap extensionMap[] = {
63 { "jpeg", "image/jpeg" },
64 { "jpg", "image/jpeg" },
65 { "js", "application/x-javascript" },
66 + { "mht", "application/x-mimearchive" },
67 + { "mhtml", "application/x-mimearchive" },
68 { "mng", "video/x-mng" },
69 { "pbm", "image/x-portable-bitmap" },
70 { "pgm", "image/x-portable-graymap" },
71 diff --git a/Source/WebKit2/CMakeLists.txt b/Source/WebKit2/CMakeLists.txt
72 index 95f9acb..ca1902f 100644
73 --- a/Source/WebKit2/CMakeLists.txt
74 +++ b/Source/WebKit2/CMakeLists.txt
75 @@ -69,6 +69,7 @@ set(WebKit2_INCLUDE_DIRECTORIES
76 "${WEBCORE_DIR}/html/track"
77 "${WEBCORE_DIR}/inspector"
78 "${WEBCORE_DIR}/loader"
79 + "${WEBCORE_DIR}/loader/archive"
80 "${WEBCORE_DIR}/loader/icon"
81 "${WEBCORE_DIR}/loader/cache"
83 diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
84 index f1f6d4c..7709abc 100644
85 --- a/Source/WebKit2/ChangeLog
86 +++ b/Source/WebKit2/ChangeLog
88 +2012-12-26 KwangYong Choi <ky0.choi@samsung.com>
90 + [EFL] Enable MHTML feature
91 + https://bugs.webkit.org/show_bug.cgi?id=xxxxx
93 + Reviewed by NOBODY (OOPS!).
95 + Add missing include directory for ENABLE_MHTML.
99 2012-12-26 Csaba Osztrogonác <ossy@webkit.org>
101 Unreviewed Xmas buildfix after r138479.
102 diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake
103 index 800a709..1fc3def 100644
104 --- a/Source/cmake/OptionsEfl.cmake
105 +++ b/Source/cmake/OptionsEfl.cmake
106 @@ -70,6 +70,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LINK_PREFETCH ON)
107 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT ON)
108 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CAPTURE ON)
109 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER ON)
110 +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML ON)
111 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MICRODATA ON)
112 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NAVIGATOR_CONTENT_UTILS ON)
113 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API ON)
114 diff --git a/Tools/ChangeLog b/Tools/ChangeLog
115 index 7f40db6..5890dbf 100644
116 --- a/Tools/ChangeLog
117 +++ b/Tools/ChangeLog
119 +2012-12-26 KwangYong Choi <ky0.choi@samsung.com>
121 + [EFL] Enable MHTML feature
122 + https://bugs.webkit.org/show_bug.cgi?id=xxxxx
124 + Reviewed by NOBODY (OOPS!).
126 + Enable MHTML feature for EFL port by default.
128 + * Scripts/webkitperl/FeatureList.pm:
130 2012-12-25 Christophe Dumez <christophe.dumez@intel.com>
132 [EFL][WK2] Refactor snapshot taking code
133 diff --git a/Tools/Scripts/webkitperl/FeatureList.pm b/Tools/Scripts/webkitperl/FeatureList.pm
134 index 2eddb26..975f2bf 100644
135 --- a/Tools/Scripts/webkitperl/FeatureList.pm
136 +++ b/Tools/Scripts/webkitperl/FeatureList.pm
137 @@ -332,7 +332,7 @@ my @features = (
138 define => "ENABLE_METER_ELEMENT", default => !isAppleWinWebKit(), value => \$meterTagSupport },
140 { option => "mhtml", desc => "Toggle MHTML support",
141 - define => "ENABLE_MHTML", default => isGtk(), value => \$mhtmlSupport },
142 + define => "ENABLE_MHTML", default => (isGtk() || isEfl()), value => \$mhtmlSupport },
144 { option => "microdata", desc => "Toggle Microdata support",
145 define => "ENABLE_MICRODATA", default => (isEfl() || isBlackBerry() || isGtk()), value => \$microdataSupport },