[EFL] Enable MHTML feature

https://bugs.webkit.org/show_bug.cgi?id=105815

Patch by KwangYong Choi <ky0.choi@samsung.com> on 2013-01-01
Reviewed by Laszlo Gombos.

.:

ENABLE_MHTML is now ON for EFL.

* Source/cmake/OptionsEfl.cmake:

Source/WebCore:

Add application/x-mimearchive type to archive mime types.
Add mht and mhtml to extension map.

No new tests. Existing layout tests pass.

* loader/archive/ArchiveFactory.cpp:
(WebCore::archiveMIMETypes):
* platform/efl/MIMETypeRegistryEfl.cpp:
(WebCore):

Source/WebKit2:

Add missing include directory for ENABLE_MHTML.

* CMakeLists.txt:

Tools:

Enable MHTML feature for EFL port by default.

* Scripts/webkitperl/FeatureList.pm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@138605 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index f293d59..8ee8e0e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2013-01-01  KwangYong Choi  <ky0.choi@samsung.com>
+
+        [EFL] Enable MHTML feature
+        https://bugs.webkit.org/show_bug.cgi?id=105815
+
+        Reviewed by Laszlo Gombos.
+
+        ENABLE_MHTML is now ON for EFL.
+
+        * Source/cmake/OptionsEfl.cmake:
+
 2012-12-31  Kondapally Kalyan  <kalyan.kondapally@intel.com>
 
         [EFL][WebGL] Add compile time support for GLES2.

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index e62b2a9..57af65d 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2013-01-01  KwangYong Choi  <ky0.choi@samsung.com>
+
+        [EFL] Enable MHTML feature
+        https://bugs.webkit.org/show_bug.cgi?id=105815
+
+        Reviewed by Laszlo Gombos.
+
+        Add application/x-mimearchive type to archive mime types.
+        Add mht and mhtml to extension map.
+
+        No new tests. Existing layout tests pass.
+
+        * loader/archive/ArchiveFactory.cpp:
+        (WebCore::archiveMIMETypes):
+        * platform/efl/MIMETypeRegistryEfl.cpp:
+        (WebCore):
+
 2013-01-01  Mike West  <mkwst@chromium.org>
 
         seamless iframes don't inherit styles when srcdoc is used

diff --git a/Source/WebCore/loader/archive/ArchiveFactory.cpp b/Source/WebCore/loader/archive/ArchiveFactory.cpp
index 4ebb52b..a989154 100644 (file)
--- a/Source/WebCore/loader/archive/ArchiveFactory.cpp
+++ b/Source/WebCore/loader/archive/ArchiveFactory.cpp
@@ -70,7 +70,7 @@ static ArchiveMIMETypesMap& archiveMIMETypes()
     mimeTypes.set("multipart/related", archiveFactoryCreate<MHTMLArchive>);
 #if PLATFORM(GTK)
     mimeTypes.set("message/rfc822", archiveFactoryCreate<MHTMLArchive>);
-#elif PLATFORM(QT)
+#elif PLATFORM(QT) || PLATFORM(EFL)
     mimeTypes.set("application/x-mimearchive", archiveFactoryCreate<MHTMLArchive>);
 #endif
 #endif

diff --git a/Source/WebCore/platform/efl/MIMETypeRegistryEfl.cpp b/Source/WebCore/platform/efl/MIMETypeRegistryEfl.cpp
index d883e5d..540bb2d 100644 (file)
--- a/Source/WebCore/platform/efl/MIMETypeRegistryEfl.cpp
+++ b/Source/WebCore/platform/efl/MIMETypeRegistryEfl.cpp
@@ -51,6 +51,8 @@ static const ExtensionMap extensionMap[] = {
     { "jpeg", "image/jpeg" },
     { "jpg", "image/jpeg" },
     { "js", "application/x-javascript" },
+    { "mht", "application/x-mimearchive" },
+    { "mhtml", "application/x-mimearchive" },
     { "mng", "video/x-mng" },
     { "pbm", "image/x-portable-bitmap" },
     { "pgm", "image/x-portable-graymap" },

diff --git a/Source/WebKit2/CMakeLists.txt b/Source/WebKit2/CMakeLists.txt
index 3b424c3..03b5159 100644 (file)
--- a/Source/WebKit2/CMakeLists.txt
+++ b/Source/WebKit2/CMakeLists.txt
@@ -70,6 +70,7 @@ set(WebKit2_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/html/track"
     "${WEBCORE_DIR}/inspector"
     "${WEBCORE_DIR}/loader"
+    "${WEBCORE_DIR}/loader/archive"
     "${WEBCORE_DIR}/loader/icon"
     "${WEBCORE_DIR}/loader/cache"
     "${WEBCORE_DIR}/page"

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index eb3511b..e6403c3 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2013-01-01  KwangYong Choi  <ky0.choi@samsung.com>
+
+        [EFL] Enable MHTML feature
+        https://bugs.webkit.org/show_bug.cgi?id=105815
+
+        Reviewed by Laszlo Gombos.
+
+        Add missing include directory for ENABLE_MHTML.
+
+        * CMakeLists.txt:
+
 2012-12-30  Sam Weinig  <sam@webkit.org>
 
         Add supplementability for WebContext

diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake
index 4945186..f1a3284 100644 (file)
--- a/Source/cmake/OptionsEfl.cmake
+++ b/Source/cmake/OptionsEfl.cmake
@@ -70,6 +70,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LINK_PREFETCH ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CAPTURE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MICRODATA ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NAVIGATOR_CONTENT_UTILS ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API ON)

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index c03d662..d715571 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2013-01-01  KwangYong Choi  <ky0.choi@samsung.com>
+
+        [EFL] Enable MHTML feature
+        https://bugs.webkit.org/show_bug.cgi?id=105815
+
+        Reviewed by Laszlo Gombos.
+
+        Enable MHTML feature for EFL port by default.
+
+        * Scripts/webkitperl/FeatureList.pm:
+
 2013-01-01  Alan Cutter  <alancutter@chromium.org>
 
         sheriff-bot should know who the gardeners/sheriffs are

diff --git a/Tools/Scripts/webkitperl/FeatureList.pm b/Tools/Scripts/webkitperl/FeatureList.pm
index b493e71..2f45ef3 100644 (file)
--- a/Tools/Scripts/webkitperl/FeatureList.pm
+++ b/Tools/Scripts/webkitperl/FeatureList.pm
@@ -332,7 +332,7 @@ my @features = (
       define => "ENABLE_METER_ELEMENT", default => !isAppleWinWebKit(), value => \$meterTagSupport },
 
     { option => "mhtml", desc => "Toggle MHTML support",
-      define => "ENABLE_MHTML", default => isGtk(), value => \$mhtmlSupport },
+      define => "ENABLE_MHTML", default => (isGtk() || isEfl()), value => \$mhtmlSupport },
 
     { option => "microdata", desc => "Toggle Microdata support",
       define => "ENABLE_MICRODATA", default => (isEfl() || isBlackBerry() || isGtk()), value => \$microdataSupport },