Title: [205474] trunk/Source/WebKit2
- Revision
- 205474
- Author
- [email protected]
- Date
- 2016-09-06 04:19:52 -0700 (Tue, 06 Sep 2016)
Log Message
[GTK][EFL] Make *_PROCESS_CMD_PREFIX conditional on DEVELOPER_MODE
https://bugs.webkit.org/show_bug.cgi?id=161621
Patch by Emanuele Aina <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (205473 => 205474)
--- trunk/Source/WebKit2/ChangeLog 2016-09-06 11:06:52 UTC (rev 205473)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-06 11:19:52 UTC (rev 205474)
@@ -1,3 +1,23 @@
+2016-09-06 Emanuele Aina <[email protected]>
+
+ [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 <[email protected]>
Fix ENABLE(GAMEPAD) build errors on non-Cocoa platforms
Modified: trunk/Source/WebKit2/UIProcess/ChildProcessProxy.cpp (205473 => 205474)
--- trunk/Source/WebKit2/UIProcess/ChildProcessProxy.cpp 2016-09-06 11:06:52 UTC (rev 205473)
+++ trunk/Source/WebKit2/UIProcess/ChildProcessProxy.cpp 2016-09-06 11:19:52 UTC (rev 205474)
@@ -51,7 +51,7 @@
if (const char* userDirectorySuffix = getenv("DIRHELPER_USER_DIR_SUFFIX"))
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) {
case ProcessLauncher::ProcessType::Web:
Modified: trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h (205473 => 205474)
--- trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h 2016-09-06 11:06:52 UTC (rev 205473)
+++ trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h 2016-09-06 11:19:52 UTC (rev 205474)
@@ -60,7 +60,7 @@
ProcessType processType;
HashMap<String, String> extraInitializationData;
-#if (PLATFORM(EFL) || PLATFORM(GTK)) && !defined(NDEBUG)
+#if ENABLE(DEVELOPER_MODE) && (PLATFORM(GTK) || PLATFORM(EFL))
String processCmdPrefix;
#endif
};
Modified: trunk/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp (205473 => 205474)
--- trunk/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp 2016-09-06 11:06:52 UTC (rev 205473)
+++ trunk/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp 2016-09-06 11:19:52 UTC (rev 205474)
@@ -128,7 +128,7 @@
return;
}
-#ifndef NDEBUG
+#if ENABLE(DEVELOPER_MODE)
if (!m_launchOptions.processCmdPrefix.isEmpty())
processCmdPrefix = m_launchOptions.processCmdPrefix;
#endif
Modified: trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp (205473 => 205474)
--- trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2016-09-06 11:06:52 UTC (rev 205473)
+++ trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2016-09-06 11:19:52 UTC (rev 205474)
@@ -96,7 +96,7 @@
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()) {
Vector<String> splitArgs;
@@ -109,7 +109,7 @@
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++)
argv[i++] = const_cast<char*>(it->data());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
