Attachment 362489 Details for Bug 194494 – Patch for landing

[patch] Patch for landing

wpe-host-fd.diff (text/plain), 8.58 KB, created by Carlos Garcia Campos on 2019-02-20 02:34:06 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2019-02-20 02:34:06 PST

Size: 8.58 KB

patch

obsolete

>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 2ca59b980af..242cea16984 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,25 @@
>+2019-02-20  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>+        [WPE] Send client host fd and library name as web process creation parameters
>+        https://bugs.webkit.org/show_bug.cgi?id=194494
>+
>+        Reviewed by Å½an DoberÅ¡ek.
>+
>+        Instead of using command line arguments. The code is simpler and we don't need wpe specific code in process
>+        launcher glib implementation.
>+
>+        * Shared/WebProcessCreationParameters.cpp:
>+        (WebKit::WebProcessCreationParameters::encode const):
>+        (WebKit::WebProcessCreationParameters::decode):
>+        * Shared/WebProcessCreationParameters.h:
>+        * UIProcess/Launcher/glib/ProcessLauncherGLib.cpp:
>+        (WebKit::ProcessLauncher::launchProcess):
>+        * UIProcess/glib/WebProcessPoolGLib.cpp:
>+        (WebKit::WebProcessPool::platformInitializeWebProcess):
>+        * WebProcess/glib/WebProcessGLib.cpp:
>+        (WebKit::WebProcess::platformInitializeWebProcess):
>+        * WebProcess/wpe/WebProcessMainWPE.cpp:
>+
> 2019-02-20  Adrian Perez de Castro  <aperez@igalia.com>
> 
>         [WPE][GTK] Enable support for CONTENT_EXTENSIONS
>diff --git a/Source/WebKit/Shared/WebProcessCreationParameters.cpp b/Source/WebKit/Shared/WebProcessCreationParameters.cpp
>index 29f9933ed8a..3ecb1f14454 100644
>--- a/Source/WebKit/Shared/WebProcessCreationParameters.cpp
>+++ b/Source/WebKit/Shared/WebProcessCreationParameters.cpp
>@@ -159,6 +159,11 @@ void WebProcessCreationParameters::encode(IPC::Encoder& encoder) const
>     encoder << screenProperties;
>     encoder << useOverlayScrollbars;
> #endif
>+
>+#if PLATFORM(WPE)
>+    encoder << hostClientFileDescriptor;
>+    encoder << implementationLibraryName;
>+#endif
> }
> 
> bool WebProcessCreationParameters::decode(IPC::Decoder& decoder, WebProcessCreationParameters& parameters)
>@@ -421,6 +426,13 @@ bool WebProcessCreationParameters::decode(IPC::Decoder& decoder, WebProcessCreat
>         return false;
> #endif
> 
>+#if PLATFORM(WPE)
>+    if (!decoder.decode(parameters.hostClientFileDescriptor))
>+        return false;
>+    if (!decoder.decode(parameters.implementationLibraryName))
>+        return false;
>+#endif
>+
>     return true;
> }
> 
>diff --git a/Source/WebKit/Shared/WebProcessCreationParameters.h b/Source/WebKit/Shared/WebProcessCreationParameters.h
>index b7821aa5cfb..86f55e1ca33 100644
>--- a/Source/WebKit/Shared/WebProcessCreationParameters.h
>+++ b/Source/WebKit/Shared/WebProcessCreationParameters.h
>@@ -198,6 +198,11 @@ struct WebProcessCreationParameters {
>     WebCore::ScreenProperties screenProperties;
>     bool useOverlayScrollbars { true };
> #endif
>+
>+#if PLATFORM(WPE)
>+    IPC::Attachment hostClientFileDescriptor;
>+    CString implementationLibraryName;
>+#endif
> };
> 
> } // namespace WebKit
>diff --git a/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp b/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
>index 0c39073fe1d..34028e68035 100644
>--- a/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
>+++ b/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
>@@ -42,10 +42,6 @@
> #include <wtf/text/CString.h>
> #include <wtf/text/WTFString.h>
> 
>-#if PLATFORM(WPE)
>-#include <wpe/wpe.h>
>-#endif
>-
> namespace WebKit {
> 
> static void childSetupFunction(gpointer userData)
>@@ -112,20 +108,6 @@ void ProcessLauncher::launchProcess()
>     GUniquePtr<gchar> webkitSocket(g_strdup_printf("%d", socketPair.client));
>     unsigned nargs = 5; // size of the argv array for g_spawn_async()
> 
>-#if PLATFORM(WPE)
>-    GUniquePtr<gchar> wpeSocket;
>-    CString wpeBackendLibraryParameter;
>-    if (m_launchOptions.processType == ProcessLauncher::ProcessType::Web) {
>-#if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(0, 2, 0)
>-        wpeBackendLibraryParameter = FileSystem::fileSystemRepresentation(wpe_loader_get_loaded_implementation_library_name());
>-#endif
>-        nargs++;
>-
>-        wpeSocket = GUniquePtr<gchar>(g_strdup_printf("%d", wpe_renderer_host_create_client()));
>-        nargs++;
>-    }
>-#endif
>-
> #if ENABLE(DEVELOPER_MODE)
>     Vector<CString> prefixArgs;
>     if (!m_launchOptions.processCmdPrefix.isNull()) {
>@@ -145,12 +127,6 @@ void ProcessLauncher::launchProcess()
>     argv[i++] = const_cast<char*>(realExecutablePath.data());
>     argv[i++] = processIdentifier.get();
>     argv[i++] = webkitSocket.get();
>-#if PLATFORM(WPE)
>-    if (m_launchOptions.processType == ProcessLauncher::ProcessType::Web) {
>-        argv[i++] = const_cast<char*>(wpeBackendLibraryParameter.isNull() ? "-" : wpeBackendLibraryParameter.data());
>-        argv[i++] = wpeSocket.get();
>-    }
>-#endif
> #if ENABLE(NETSCAPE_PLUGIN_API)
>     argv[i++] = const_cast<char*>(realPluginPath.data());
> #else
>diff --git a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
>index a2a160be686..67fe3db8a5a 100644
>--- a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
>+++ b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
>@@ -32,8 +32,13 @@
> #include "WebProcessCreationParameters.h"
> #include <JavaScriptCore/RemoteInspectorServer.h>
> #include <WebCore/GStreamerCommon.h>
>+#include <wtf/FileSystem.h>
> #include <wtf/glib/GUniquePtr.h>
> 
>+#if PLATFORM(WPE)
>+#include <wpe/wpe.h>
>+#endif
>+
> namespace WebKit {
> 
> #if ENABLE(REMOTE_INSPECTOR)
>@@ -83,6 +88,13 @@ void WebProcessPool::platformInitialize()
> 
> void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
> {
>+#if PLATFORM(WPE)
>+    parameters.hostClientFileDescriptor = wpe_renderer_host_create_client();
>+#if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(0, 2, 0)
>+    parameters.implementationLibraryName = FileSystem::fileSystemRepresentation(wpe_loader_get_loaded_implementation_library_name());
>+#endif
>+#endif
>+
>     parameters.memoryCacheDisabled = m_memoryCacheDisabled || cacheModel() == CacheModel::DocumentViewer;
>     parameters.proxySettings = m_networkProxySettings;
> 
>diff --git a/Source/WebKit/WebProcess/glib/WebProcessGLib.cpp b/Source/WebKit/WebProcess/glib/WebProcessGLib.cpp
>index 17da52de5ed..192a1175641 100644
>--- a/Source/WebKit/WebProcess/glib/WebProcessGLib.cpp
>+++ b/Source/WebKit/WebProcess/glib/WebProcessGLib.cpp
>@@ -35,6 +35,11 @@
> #include "WaylandCompositorDisplay.h"
> #endif
> 
>+#if PLATFORM(WPE)
>+#include <WebCore/PlatformDisplayLibWPE.h>
>+#include <wpe/wpe.h>
>+#endif
>+
> namespace WebKit {
> 
> void WebProcess::platformSetCacheModel(CacheModel cacheModel)
>@@ -44,6 +49,13 @@ void WebProcess::platformSetCacheModel(CacheModel cacheModel)
> 
> void WebProcess::platformInitializeWebProcess(WebProcessCreationParameters&& parameters)
> {
>+#if PLATFORM(WPE)
>+    auto& implementationLibraryName = parameters.implementationLibraryName;
>+    if (!implementationLibraryName.isNull() && implementationLibraryName.data()[0] != '\0')
>+        wpe_loader_init(parameters.implementationLibraryName.data());
>+    RELEASE_ASSERT(is<PlatformDisplayLibWPE>(PlatformDisplay::sharedDisplay()));
>+    downcast<PlatformDisplayLibWPE>(PlatformDisplay::sharedDisplay()).initialize(parameters.hostClientFileDescriptor.releaseFileDescriptor());
>+#endif
> #if PLATFORM(WAYLAND)
>     m_waylandCompositorDisplay = WaylandCompositorDisplay::create(parameters.waylandCompositorDisplayName);
> #endif
>diff --git a/Source/WebKit/WebProcess/wpe/WebProcessMainWPE.cpp b/Source/WebKit/WebProcess/wpe/WebProcessMainWPE.cpp
>index 13192b44d43..fd8c6ab2026 100644
>--- a/Source/WebKit/WebProcess/wpe/WebProcessMainWPE.cpp
>+++ b/Source/WebKit/WebProcess/wpe/WebProcessMainWPE.cpp
>@@ -29,11 +29,7 @@
> 
> #include "AuxiliaryProcessMain.h"
> #include "WebProcess.h"
>-#include <WebCore/PlatformDisplayLibWPE.h>
> #include <glib.h>
>-#include <iostream>
>-#include <libsoup/soup.h>
>-#include <wpe/wpe.h>
> 
> namespace WebKit {
> using namespace WebCore;
>@@ -53,28 +49,6 @@ public:
> 
>         return true;
>     }
>-
>-    bool parseCommandLine(int argc, char** argv) override
>-    {
>-        ASSERT(argc == 5);
>-        if (argc < 5)
>-            return false;
>-
>-        if (!AuxiliaryProcessMainBase::parseCommandLine(argc, argv))
>-            return false;
>-
>-#if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(0, 2, 0)
>-        wpe_loader_init(argv[3]);
>-#endif
>-
>-        int wpeFd = atoi(argv[4]);
>-        RunLoop::main().dispatch(
>-            [wpeFd] {
>-                RELEASE_ASSERT(is<PlatformDisplayLibWPE>(PlatformDisplay::sharedDisplay()));
>-                downcast<PlatformDisplayLibWPE>(PlatformDisplay::sharedDisplay()).initialize(wpeFd);
>-            });
>-        return true;
>-    }
> };
> 
> int WebProcessMainUnix(int argc, char** argv)

Actions: View | Formatted Diff | Diff

Attachments on bug 194494: 361666 | 361677 | 362489