Title: [181529] releases/WebKitGTK/webkit-2.8
- Revision
- 181529
- Author
- [email protected]
- Date
- 2015-03-16 02:06:09 -0700 (Mon, 16 Mar 2015)
Log Message
Merge r181392 - [GTK] Do not look for child processes in the UI process binary path
https://bugs.webkit.org/show_bug.cgi?id=135752
Reviewed by Gustavo Noronha Silva.
.:
* Source/cmake/OptionsGTK.cmake: Add -DDEVELOPMENT_BUILD=1 to the
build for development builds.
Source/WebKit2:
It's only useful for internal tools and tests, but never when
installed, since we don't install the processes in the bin dir but
in the libexec dir.
* Shared/gtk/ProcessExecutablePathGtk.cpp:
(WebKit::findWebKitProcess): Only look or the executables in the
UI process binary path or WEBKIT_EXEC_PATH for development builds.
* UIProcess/API/gtk/WebKitWebContext.cpp:
(injectedBundleDirectory): Only check
WEBKIT_INJECTED_BUNDLE_PATH env var for development builds.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/ChangeLog (181528 => 181529)
--- releases/WebKitGTK/webkit-2.8/ChangeLog 2015-03-16 08:42:25 UTC (rev 181528)
+++ releases/WebKitGTK/webkit-2.8/ChangeLog 2015-03-16 09:06:09 UTC (rev 181529)
@@ -1,3 +1,13 @@
+2015-03-11 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Do not look for child processes in the UI process binary path
+ https://bugs.webkit.org/show_bug.cgi?id=135752
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * Source/cmake/OptionsGTK.cmake: Add -DDEVELOPMENT_BUILD=1 to the
+ build for development builds.
+
2015-03-10 Carlos Garcia Campos <[email protected]> and José Dapena Paz <[email protected]>
[GTK] Add a configure option to build with OpenGL ES 2
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog (181528 => 181529)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-03-16 08:42:25 UTC (rev 181528)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-03-16 09:06:09 UTC (rev 181529)
@@ -1,3 +1,21 @@
+2015-03-11 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Do not look for child processes in the UI process binary path
+ https://bugs.webkit.org/show_bug.cgi?id=135752
+
+ Reviewed by Gustavo Noronha Silva.
+
+ It's only useful for internal tools and tests, but never when
+ installed, since we don't install the processes in the bin dir but
+ in the libexec dir.
+
+ * Shared/gtk/ProcessExecutablePathGtk.cpp:
+ (WebKit::findWebKitProcess): Only look or the executables in the
+ UI process binary path or WEBKIT_EXEC_PATH for development builds.
+ * UIProcess/API/gtk/WebKitWebContext.cpp:
+ (injectedBundleDirectory): Only check
+ WEBKIT_INJECTED_BUNDLE_PATH env var for development builds.
+
2015-03-10 Carlos Garcia Campos <[email protected]>
[GTK] Contents not shown when entering AC mode unless the window is resized
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp (181528 => 181529)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp 2015-03-16 08:42:25 UTC (rev 181528)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp 2015-03-16 09:06:09 UTC (rev 181529)
@@ -29,12 +29,16 @@
#include <WebCore/FileSystem.h>
#include <glib.h>
+
+#if defined(DEVELOPMENT_BUILD)
#include <wtf/gobject/GlibUtilities.h>
+#endif
using namespace WebCore;
namespace WebKit {
+#if defined(DEVELOPMENT_BUILD)
static String getExecutablePath()
{
CString executablePath = getCurrentExecutablePath();
@@ -42,9 +46,11 @@
return directoryName(filenameToString(executablePath.data()));
return String();
}
+#endif
static String findWebKitProcess(const char* processName)
{
+#if defined(DEVELOPMENT_BUILD)
static const char* execDirectory = g_getenv("WEBKIT_EXEC_PATH");
if (execDirectory) {
String processPath = pathByAppendingComponent(filenameToString(execDirectory), processName);
@@ -58,6 +64,7 @@
if (fileExists(processPath))
return processPath;
}
+#endif
return pathByAppendingComponent(filenameToString(LIBEXECDIR), processName);
}
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (181528 => 181529)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2015-03-16 08:42:25 UTC (rev 181528)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2015-03-16 09:06:09 UTC (rev 181529)
@@ -218,9 +218,11 @@
static const char* injectedBundleDirectory()
{
+#if defined(DEVELOPMENT_BUILD)
const char* bundleDirectory = g_getenv("WEBKIT_INJECTED_BUNDLE_PATH");
if (bundleDirectory && g_file_test(bundleDirectory, G_FILE_TEST_IS_DIR))
return bundleDirectory;
+#endif
static const char* injectedBundlePath = LIBDIR G_DIR_SEPARATOR_S "webkit2gtk-" WEBKITGTK_API_VERSION_STRING
G_DIR_SEPARATOR_S "injected-bundle" G_DIR_SEPARATOR_S;
Modified: releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsGTK.cmake (181528 => 181529)
--- releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsGTK.cmake 2015-03-16 08:42:25 UTC (rev 181528)
+++ releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsGTK.cmake 2015-03-16 09:06:09 UTC (rev 181529)
@@ -248,6 +248,10 @@
add_definitions(-DUSER_AGENT_GTK_MINOR_VERSION=1)
add_definitions(-DWEBKITGTK_API_VERSION_STRING="${WEBKITGTK_API_VERSION}")
+if (DEVELOPER_MODE)
+ add_definitions(-DDEVELOPMENT_BUILD=1)
+endif ()
+
if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
set(GSTREAMER_COMPONENTS app pbutils)
add_definitions(-DWTF_USE_GSTREAMER)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
