Attachment 211791 Details for Bug 121434 – Patch

[patch] Patch

bug-121434-20130916174021.patch (text/plain), 5.16 KB, created by Csaba Osztrogonác on 2013-09-16 08:40:23 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Csaba Osztrogonác

Created: 2013-09-16 08:40:23 PDT

Size: 5.16 KB

patch

obsolete

>Subversion Revision: 155859
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index 38f2293a9cec6dfd165176ea065e6b96bcb0e558..936115972c2ebeee1078adc0aebc8db655852219 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,3 +1,23 @@
>+2013-09-16  Csaba OsztrogonÃ¡c  <ossy@webkit.org>
>+
>+        [GTK][EFL] Add NetworkProcess support for ProcessLauncher
>+        https://bugs.webkit.org/show_bug.cgi?id=121434
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Original patch by Balazs Kelemen <kbalazs@webkit.org>
>+        and Kwang Yul Seo <skyul@company100.net>
>+
>+        * Shared/ProcessExecutablePath.h:
>+        * Shared/efl/ProcessExecutablePathEfl.cpp:
>+        (WebKit::executablePathOfNetworkProcess):
>+        * Shared/gtk/ProcessExecutablePathGtk.cpp:
>+        (WebKit::executablePathOfNetworkProcess):
>+        * UIProcess/Launcher/efl/ProcessLauncherEfl.cpp:
>+        (WebKit::ProcessLauncher::launchProcess):
>+        * UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
>+        (WebKit::ProcessLauncher::launchProcess):
>+
> 2013-09-16  Eunmi Lee  <eunmi15.lee@samsung.com>
> 
>         [EFL][WK2] Implement pan and flick gesture.
>diff --git a/Source/WebKit2/Shared/ProcessExecutablePath.h b/Source/WebKit2/Shared/ProcessExecutablePath.h
>index 5fbf3201811055e384abedb6d3dd5daf1c7b74dd..d78ebcddeba96e5a9a301ec7e8cd523749dbde29 100644
>--- a/Source/WebKit2/Shared/ProcessExecutablePath.h
>+++ b/Source/WebKit2/Shared/ProcessExecutablePath.h
>@@ -32,6 +32,9 @@ namespace WebKit {
> 
> String executablePathOfWebProcess();
> String executablePathOfPluginProcess();
>+#if ENABLE(NETWORK_PROCESS)
>+String executablePathOfNetworkProcess();
>+#endif
> 
> }
> 
>diff --git a/Source/WebKit2/Shared/efl/ProcessExecutablePathEfl.cpp b/Source/WebKit2/Shared/efl/ProcessExecutablePathEfl.cpp
>index 618ab2a143afedc55e1a3eee2ca40765dbc1ebf7..c9e492eb4616978cfd0e51aaece759b1028e6206 100644
>--- a/Source/WebKit2/Shared/efl/ProcessExecutablePathEfl.cpp
>+++ b/Source/WebKit2/Shared/efl/ProcessExecutablePathEfl.cpp
>@@ -74,4 +74,13 @@ String executablePathOfPluginProcess()
>     return webKitPluginProcessName;
> }
> 
>+#if ENABLE(NETWORK_PROCESS)
>+String executablePathOfNetworkProcess()
>+{
>+    DEFINE_STATIC_LOCAL(const String, webKitNetworkProcessName, (findProcessPath(NETWORKPROCESSNAME)));
>+
>+    return webKitNetworkProcessName;
>+}
>+#endif
>+
> } // namespace WebKit
>diff --git a/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp b/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp
>index 5e15029c3720a3a30546041412aece6860eca9ba..9f2e6295d8c1d40e262def145395e88070954ede 100644
>--- a/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp
>+++ b/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp
>@@ -37,6 +37,7 @@ namespace WebKit {
> 
> const char* gWebKitWebProcessName = "WebKitWebProcess";
> const char* gWebKitPluginProcessName = "WebKitPluginProcess";
>+const char* gWebKitNetworkProcessName = "WebKitNetworkProcess";
> 
> static String findWebKitProcess(const char* processName)
> {
>@@ -76,4 +77,11 @@ String executablePathOfPluginProcess()
>     return findWebKitProcess(gWebKitPluginProcessName);
> }
> 
>+#if ENABLE(NETWORK_PROCESS)
>+String executablePathOfNetworkProcess()
>+{
>+    return findWebKitProcess(gWebKitNetworkProcessName);
>+}
>+#endif
>+
> } // namespace WebKit
>diff --git a/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp b/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp
>index 9b918abb874d90c309c83edad5acbd3ec372a566..99411171e3a14015ba07e26279ce3b3d40bd3b51 100644
>--- a/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp
>+++ b/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp
>@@ -83,6 +83,11 @@ void ProcessLauncher::launchProcess()
>         pluginPath = m_launchOptions.extraInitializationData.get("plugin-path");
>         break;
> #endif
>+#if ENABLE(NETWORK_PROCESS)
>+    case NetworkProcess:
>+        executablePath = executablePathOfNetworkProcess().utf8();
>+        break;
>+#endif
>     default:
>         ASSERT_NOT_REACHED();
>         return;
>diff --git a/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp b/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp
>index 2ae1fdb5c929ac242daf4fffd4a5cdbfdefcd09d..dd80056180c10f6f9a1e99872fd1d945c557191e 100644
>--- a/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp
>+++ b/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp
>@@ -76,12 +76,23 @@ void ProcessLauncher::launchProcess()
> 
>     String executablePath, pluginPath;
>     CString realExecutablePath, realPluginPath;
>-    if (m_launchOptions.processType == WebProcess)
>+    switch (m_launchOptions.processType) {
>+    case WebProcess:
>         executablePath = executablePathOfWebProcess();
>-    else {
>+        break;
>+    case PluginProcess:
>         executablePath = executablePathOfPluginProcess();
>         pluginPath = m_launchOptions.extraInitializationData.get("plugin-path");
>         realPluginPath = fileSystemRepresentation(pluginPath);
>+        break;
>+#if ENABLE(NETWORK_PROCESS)
>+    case NetworkProcess:
>+        executablePath = executablePathOfNetworkProcess();
>+        break;
>+#endif
>+    default:
>+        ASSERT_NOT_REACHED();
>+        return;
>     }
> 
>     realExecutablePath = fileSystemRepresentation(executablePath);

Actions: View | Formatted Diff | Diff

Attachments on bug 121434: 211791 | 211799