Changeset 181529 in webkit

Timestamp:

Mar 16, 2015, 2:06:09 AM (11 years ago)

Author:

Carlos Garcia Campos

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.

Location:

releases/WebKitGTK/webkit-2.8

Files:

• ChangeLog (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp (modified) (4 diffs)
• Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (modified) (1 diff)
• Source/cmake/OptionsGTK.cmake (modified) (1 diff)

releases/WebKitGTK/webkit-2.8/ChangeLog

@@ +1 @@
+2015-03-11  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [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  <cgarcia@igalia.com> and José Dapena Paz  <jdapena@igalia.com>
 

releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-03-11  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [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  <cgarcia@igalia.com>
 

releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp

@@ -30 +30 @@
 #include <WebCore/FileSystem.h>
 #include <glib.h>
+
+#if defined(DEVELOPMENT_BUILD)
 #include <wtf/gobject/GlibUtilities.h>
+#endif
 
 using namespace WebCore;
@@ -36 +39 @@
 namespace WebKit {
 
+#if defined(DEVELOPMENT_BUILD)
 static String getExecutablePath()
 {
@@ -43 +47 @@
     return String();
 }
+#endif
 
 static String findWebKitProcess(const char* processName)
 {
+#if defined(DEVELOPMENT_BUILD)
     static const char* execDirectory = g_getenv("WEBKIT_EXEC_PATH");
     if (execDirectory) {
@@ -59 +65 @@
             return processPath;
     }
+#endif
 
     return pathByAppendingComponent(filenameToString(LIBEXECDIR), processName);

releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp

@@ -219 +219 @@
 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

releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsGTK.cmake

@@ -249 +249 @@
 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)