Attachment 362440 Details for Bug 194830 – Patch

[patch] Patch

bug-194830-20190220000153.patch (text/plain), 3.26 KB, created by Loïc Yhuel on 2019-02-19 15:01:54 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Loïc Yhuel

Created: 2019-02-19 15:01:54 PST

Size: 3.26 KB

patch

obsolete

>Subversion Revision: 241757
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 6256c8af0edd9565666e9df373d167b55e74ad0c..00393f0d149c6a7fcea3c69449b2faeace3c15a4 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-02-19  LoÃ¯c Yhuel  <loic.yhuel@softathome.com>
>+
>+        [WPE] Do not create a PlatformDisplay in the Service Worker process
>+        https://bugs.webkit.org/show_bug.cgi?id=194830
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        It avoids opening the Wayland socket in this WPEWebProcess, which might cause issues
>+        depending on the platform, and allocates unneeded resources.
>+
>+        * UIProcess/Launcher/glib/ProcessLauncherGLib.cpp:
>+        (WebKit::ProcessLauncher::launchProcess): No wpeSocket argument for Service Worker.
>+        * WebProcess/wpe/WebProcessMainWPE.cpp: Support optional wpeSocket argument.
>+
> 2019-02-18  Alex Christensen  <achristensen@webkit.org>
> 
>         Revert functional part of r241451
>diff --git a/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp b/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
>index 0c39073fe1de7adaf5312683d816462f64d3ec6f..6d9974707f40429c54ad564dce5411992673fe4e 100644
>--- a/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
>+++ b/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
>@@ -120,9 +120,15 @@ void ProcessLauncher::launchProcess()
>         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++;
>+#if ENABLE(SERVICE_WORKER)
>+        if (!m_launchOptions.extraInitializationData.contains("service-worker-process"))
>+#else
>+        if (true)
>+#endif
>+        {
>+            wpeSocket = GUniquePtr<gchar>(g_strdup_printf("%d", wpe_renderer_host_create_client()));
>+            nargs++;
>+        }
>     }
> #endif
> 
>@@ -148,7 +154,8 @@ void ProcessLauncher::launchProcess()
> #if PLATFORM(WPE)
>     if (m_launchOptions.processType == ProcessLauncher::ProcessType::Web) {
>         argv[i++] = const_cast<char*>(wpeBackendLibraryParameter.isNull() ? "-" : wpeBackendLibraryParameter.data());
>-        argv[i++] = wpeSocket.get();
>+        if (wpeSocket)
>+            argv[i++] = wpeSocket.get();
>     }
> #endif
> #if ENABLE(NETSCAPE_PLUGIN_API)
>diff --git a/Source/WebKit/WebProcess/wpe/WebProcessMainWPE.cpp b/Source/WebKit/WebProcess/wpe/WebProcessMainWPE.cpp
>index 13192b44d436e22e974d3b6733da54ec7c31e4d3..25dc80a2696d058652659daf36fc0e58a4ced0ce 100644
>--- a/Source/WebKit/WebProcess/wpe/WebProcessMainWPE.cpp
>+++ b/Source/WebKit/WebProcess/wpe/WebProcessMainWPE.cpp
>@@ -56,8 +56,8 @@ public:
> 
>     bool parseCommandLine(int argc, char** argv) override
>     {
>-        ASSERT(argc == 5);
>-        if (argc < 5)
>+        ASSERT(argc == 4 || argc == 5);
>+        if (argc < 4)
>             return false;
> 
>         if (!AuxiliaryProcessMainBase::parseCommandLine(argc, argv))
>@@ -67,6 +67,11 @@ public:
>         wpe_loader_init(argv[3]);
> #endif
> 
>+#if ENABLE(SERVICE_WORKER)
>+        if (argc < 5)
>+            return true;
>+#endif
>+
>         int wpeFd = atoi(argv[4]);
>         RunLoop::main().dispatch(
>             [wpeFd] {

Actions: View | Formatted Diff | Diff

Attachments on bug 194830: 362440 | 362919 | 362973 | 363167 | 363524