Changeset 205474 in webkit

Timestamp:

Sep 6, 2016 4:19:52 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK][EFL] Make *_PROCESS_CMD_PREFIX conditional on DEVELOPER_MODE
​https://bugs.webkit.org/show_bug.cgi?id=161621

Patch by Emanuele Aina <Emanuele Aina> on 2016-09-06
Reviewed by Carlos Garcia Campos.

Instead of enabling support for the *_PROCESS_CMD_PREFIX set of
environment valiables (eg. WEB_PROCESS_CMD_PREFIX) on debug builds
only, enable it when DEVELOPER_MODE is enabled as it already guards
similar features (eg. WEBKIT_EXEC_PATH).

• UIProcess/ChildProcessProxy.cpp:

(WebKit::ChildProcessProxy::getLaunchOptions):

• UIProcess/Launcher/ProcessLauncher.h:
• UIProcess/Launcher/efl/ProcessLauncherEfl.cpp:

(WebKit::ProcessLauncher::launchProcess):

• UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:

(WebKit::ProcessLauncher::launchProcess):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ChildProcessProxy.cpp (modified) (1 diff)
• UIProcess/Launcher/ProcessLauncher.h (modified) (1 diff)
• UIProcess/Launcher/efl/ProcessLauncherEfl.cpp (modified) (1 diff)
• UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-09-06  Emanuele Aina  <emanuele.aina@collabora.com>
+
+        [GTK][EFL] Make *_PROCESS_CMD_PREFIX conditional on DEVELOPER_MODE
+        https://bugs.webkit.org/show_bug.cgi?id=161621
+
+        Reviewed by Carlos Garcia Campos.
+
+        Instead of enabling support for the *_PROCESS_CMD_PREFIX set of
+        environment valiables (eg. WEB_PROCESS_CMD_PREFIX) on debug builds
+        only, enable it when DEVELOPER_MODE is enabled as it already guards
+        similar features (eg. WEBKIT_EXEC_PATH).
+
+        * UIProcess/ChildProcessProxy.cpp:
+        (WebKit::ChildProcessProxy::getLaunchOptions):
+        * UIProcess/Launcher/ProcessLauncher.h:
+        * UIProcess/Launcher/efl/ProcessLauncherEfl.cpp:
+        (WebKit::ProcessLauncher::launchProcess):
+        * UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
+        (WebKit::ProcessLauncher::launchProcess):
+
 2016-09-05  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebKit2/UIProcess/ChildProcessProxy.cpp

@@ -52 +52 @@
         launchOptions.extraInitializationData.add(ASCIILiteral("user-directory-suffix"), userDirectorySuffix);
 
-#if !defined(NDEBUG) && (PLATFORM(GTK) || PLATFORM(EFL))
+#if ENABLE(DEVELOPER_MODE) && (PLATFORM(GTK) || PLATFORM(EFL))
     const char* varname;
     switch (launchOptions.processType) {

trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h

@@ -61 +61 @@
         HashMap<String, String> extraInitializationData;
 
-#if (PLATFORM(EFL) || PLATFORM(GTK)) && !defined(NDEBUG)
+#if ENABLE(DEVELOPER_MODE) && (PLATFORM(GTK) || PLATFORM(EFL))
         String processCmdPrefix;
 #endif

trunk/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp

@@ -129 +129 @@
     }
 
-#ifndef NDEBUG
+#if ENABLE(DEVELOPER_MODE)
     if (!m_launchOptions.processCmdPrefix.isEmpty())
         processCmdPrefix = m_launchOptions.processCmdPrefix;

trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp

@@ -97 +97 @@
     unsigned nargs = 4; // size of the argv array for g_spawn_async()
 
-#ifndef NDEBUG
+#if ENABLE(DEVELOPER_MODE)
     Vector<CString> prefixArgs;
     if (!m_launchOptions.processCmdPrefix.isNull()) {
@@ -110 +110 @@
     char** argv = g_newa(char*, nargs);
     unsigned i = 0;
-#ifndef NDEBUG
+#if ENABLE(DEVELOPER_MODE)
     // If there's a prefix command, put it before the rest of the args.
     for (auto it = prefixArgs.begin(); it != prefixArgs.end(); it++)