Attachment 257341 Details for Bug 147221 – Patch

[patch] Patch

bug-147221-20150723144528.patch (text/plain), 8.20 KB, created by Joonghun Park on 2015-07-22 22:46:44 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Joonghun Park

Created: 2015-07-22 22:46:44 PDT

Size: 8.20 KB

patch

obsolete

>Subversion Revision: 187202
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index fa2ed2e3cc77dcfeb7c1e2af48efc2439cd1c8d3..83af8a72ca399ed23699056973368dc5d62387ff 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,3 +1,21 @@
>+2015-07-22  Joonghun Park  <jh718.park@samsung.com>
>+
>+        [EFL] Enable IndexedDB based on DatabaseProcess
>+        https://bugs.webkit.org/show_bug.cgi?id=147221
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * DatabaseProcess/efl/DatabaseProcessMainEfl.cpp: Add ecore_init().
>+        Without this call, it leads to crash when launching DatabaseProcess.
>+        * PlatformEfl.cmake: Add missing include_directory.
>+        * Shared/efl/ProcessExecutablePathEfl.cpp:
>+        (WebKit::executablePathOfDatabaseProcess):
>+        * UIProcess/Launcher/efl/ProcessLauncherEfl.cpp:
>+        (WebKit::ProcessLauncher::launchProcess):
>+        * UIProcess/efl/WebProcessPoolEfl.cpp:
>+        (WebKit::WebProcessPool::legacyPlatformDefaultIndexedDBDatabaseDirectory):
>+        Add default path for indexedDB sqlite3 db file.
>+
> 2015-07-22  Commit Queue  <commit-queue@webkit.org>
> 
>         Unreviewed, rolling out r187196.
>diff --git a/Source/WebKit2/DatabaseProcess/efl/DatabaseProcessMainEfl.cpp b/Source/WebKit2/DatabaseProcess/efl/DatabaseProcessMainEfl.cpp
>index 04a12cea70789f474810aa2bcb25f40e08dfe142..0403c0a46003d7417258ca03cf3a1c886d62787d 100644
>--- a/Source/WebKit2/DatabaseProcess/efl/DatabaseProcessMainEfl.cpp
>+++ b/Source/WebKit2/DatabaseProcess/efl/DatabaseProcessMainEfl.cpp
>@@ -39,8 +39,16 @@ class DatabaseProcessMain final: public ChildProcessMainBase {
> public:
>     bool platformInitialize() override
>     {
>+        if (!ecore_init())
>+            return false;
>+
>         return true;
>     }
>+
>+    void platformFinalize() override
>+    {
>+        ecore_shutdown();
>+    }
> };
> 
> int DatabaseProcessMainUnix(int argc, char** argv)
>diff --git a/Source/WebKit2/PlatformEfl.cmake b/Source/WebKit2/PlatformEfl.cmake
>index e872da72a60846807b153b7f69c157c11e5935c1..85b0a950e7db981207de8baa6a2dc4ee3120e6da 100644
>--- a/Source/WebKit2/PlatformEfl.cmake
>+++ b/Source/WebKit2/PlatformEfl.cmake
>@@ -247,6 +247,7 @@ list(APPEND WebKit2_INCLUDE_DIRECTORIES
>     "${WEBKIT2_DIR}/Shared/Downloads/soup"
>     "${WEBKIT2_DIR}/Shared/Network/CustomProtocols/soup"
>     "${WEBKIT2_DIR}/Shared/Plugins/unix"
>+    "${WEBKIT2_DIR}/Shared/glib"
>     "${WEBKIT2_DIR}/Shared/efl"
>     "${WEBKIT2_DIR}/Shared/soup"
>     "${WEBKIT2_DIR}/Shared/unix"
>@@ -501,6 +502,7 @@ add_definitions(-DTEST_RESOURCES_DIR=\"${TEST_RESOURCES_DIR}\"
>     -DWEBPROCESSNAME=\"WebProcess\"
>     -DPLUGINPROCESSNAME=\"PluginProcess\"
>     -DNETWORKPROCESSNAME=\"NetworkProcess\"
>+    -DDATABASEPROCESSNAME=\"DatabaseProcess\"
>     -DEXTENSIONMANAGERNAME=\"libewebkit_extension_manager.so\"
>     -DGTEST_HAS_RTTI=0
> )
>diff --git a/Source/WebKit2/Shared/efl/ProcessExecutablePathEfl.cpp b/Source/WebKit2/Shared/efl/ProcessExecutablePathEfl.cpp
>index 5c1819f69ea3827be9689be2cacc4d3e992eb4a0..3d536041a4fa97c82634b82ff4981e7cae28ea7e 100644
>--- a/Source/WebKit2/Shared/efl/ProcessExecutablePathEfl.cpp
>+++ b/Source/WebKit2/Shared/efl/ProcessExecutablePathEfl.cpp
>@@ -90,4 +90,13 @@ String executablePathOfNetworkProcess()
> }
> #endif
> 
>+#if ENABLE(DATABASE_PROCESS)
>+String executablePathOfDatabaseProcess()
>+{
>+    static NeverDestroyed<const String> webkitDatabaseProcessName(findProcessPath(DATABASEPROCESSNAME));
>+
>+    return webkitDatabaseProcessName;
>+}
>+#endif
>+
> } // namespace WebKit
>diff --git a/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp b/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp
>index 7f6934ee9faca9a2a251bce4879bec5de15f516c..2bbc90b022320357416b62665141c64b24572a87 100644
>--- a/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp
>+++ b/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp
>@@ -89,6 +89,11 @@ void ProcessLauncher::launchProcess()
>         executablePath = executablePathOfNetworkProcess();
>         break;
> #endif
>+#if ENABLE(DATABASE_PROCESS)
>+    case DatabaseProcess:
>+        executablePath = executablePathOfDatabaseProcess();
>+        break;
>+#endif
>     default:
>         ASSERT_NOT_REACHED();
>         return;
>diff --git a/Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp b/Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp
>index e3ee1126e95c8ad2379366e204e04da46b85a328..1f8414274af6662d8b5cb4b7ecf68fc43cbfcb54 100644
>--- a/Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp
>+++ b/Source/WebKit2/UIProcess/efl/WebProcessPoolEfl.cpp
>@@ -109,8 +109,7 @@ String WebProcessPool::legacyPlatformDefaultWebSQLDatabaseDirectory()
> 
> String WebProcessPool::legacyPlatformDefaultIndexedDBDatabaseDirectory()
> {
>-    notImplemented();
>-    return String();
>+    return String::fromUTF8(efreet_data_home_get()) + "/WebKitEfl/IndexedDB";
> }
> 
> String WebProcessPool::platformDefaultIconDatabasePath() const
>diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake
>index cf67df26e4e3deb9a12d8c13c497b9c4ff6e5c1a..014686d6993eef0847158f529e973ab289066f4d 100644
>--- a/Source/cmake/OptionsEfl.cmake
>+++ b/Source/cmake/OptionsEfl.cmake
>@@ -79,6 +79,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SCROLL_SNAP PUBLIC OFF)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER PUBLIC ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATABASE_PROCESS PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOM4_EVENTS_CONSTRUCTOR PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE PUBLIC ON)
>@@ -91,7 +92,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PUBLIC OFF)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD_DEPRECATED PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE_IN_WORKERS PUBLIC OFF)
>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE PUBLIC OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LINK_PREFETCH PUBLIC ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CAPTURE PUBLIC ON)
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 7dbe237af7309b4430d74c65bc2bbb162112ccd1..12d69fb9db2327b6907e778a0ee48134c99576e4 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,12 @@
>+2015-07-22  Joonghun Park  <jh718.park@samsung.com>
>+
>+        [EFL] Enable IndexedDB based on DatabaseProcess
>+        https://bugs.webkit.org/show_bug.cgi?id=147221
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/webkitperl/FeatureList.pm:
>+
> 2015-07-22  Jon Honeycutt  <jhoneycutt@apple.com>
> 
>         Add --ios-simulator to run-api-tests --help.
>diff --git a/Tools/Scripts/webkitperl/FeatureList.pm b/Tools/Scripts/webkitperl/FeatureList.pm
>index 087e68c11b0b471238b7fb882ec749f19fb74c77..55f8bd8eb1edaaa2acebe9e46ff5cc0c1a3b7c4d 100644
>--- a/Tools/Scripts/webkitperl/FeatureList.pm
>+++ b/Tools/Scripts/webkitperl/FeatureList.pm
>@@ -259,7 +259,7 @@ my @features = (
>       define => "ENABLE_ICONDATABASE", default => !isIOSWebKit(), value => \$icondatabaseSupport },
> 
>     { option => "indexed-database", desc => "Toggle Indexed Database support",
>-      define => "ENABLE_INDEXED_DATABASE", default => isGtk(), value => \$indexedDatabaseSupport },
>+      define => "ENABLE_INDEXED_DATABASE", default => (isEfl() || isGtk()), value => \$indexedDatabaseSupport },
> 
>     { option => "input-speech", desc => "Toggle Input Speech support",
>       define => "ENABLE_INPUT_SPEECH", default => 0, value => \$inputSpeechSupport },
>diff --git a/ChangeLog b/ChangeLog
>index a93cd182581149111f63b489b376a6d17d6f15c7..1cf91dc37875aae5aa0c87ceebf0c31afeeb512b 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,12 @@
>+2015-07-22  Joonghun Park  <jh718.park@samsung.com>
>+
>+        [EFL] Enable IndexedDB based on DatabaseProcess
>+        https://bugs.webkit.org/show_bug.cgi?id=147221
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Source/cmake/OptionsEfl.cmake:
>+
> 2015-07-22  Alex Christensen  <achristensen@webkit.org>
> 
>         Fix quirks in CMake build on Mac and Windows

Actions: View | Formatted Diff | Diff

Attachments on bug 147221: 257341 | 257736