Changeset 181392 in webkit
- Timestamp:
- Mar 11, 2015 10:47:38 AM (9 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r181321 r181392 1 2015-03-11 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 [GTK] Do not look for child processes in the UI process binary path 4 https://bugs.webkit.org/show_bug.cgi?id=135752 5 6 Reviewed by Gustavo Noronha Silva. 7 8 * Source/cmake/OptionsGTK.cmake: Add -DDEVELOPMENT_BUILD=1 to the 9 build for development builds. 10 1 11 2015-03-10 Carlos Garcia Campos <cgarcia@igalia.com> and José Dapena Paz <jdapena@igalia.com> 2 12 -
trunk/Source/WebKit2/ChangeLog
r181364 r181392 1 2015-03-11 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 [GTK] Do not look for child processes in the UI process binary path 4 https://bugs.webkit.org/show_bug.cgi?id=135752 5 6 Reviewed by Gustavo Noronha Silva. 7 8 It's only useful for internal tools and tests, but never when 9 installed, since we don't install the processes in the bin dir but 10 in the libexec dir. 11 12 * Shared/gtk/ProcessExecutablePathGtk.cpp: 13 (WebKit::findWebKitProcess): Only look or the executables in the 14 UI process binary path or WEBKIT_EXEC_PATH for development builds. 15 * UIProcess/API/gtk/WebKitWebContext.cpp: 16 (injectedBundleDirectory): Only check 17 WEBKIT_INJECTED_BUNDLE_PATH env var for development builds. 18 1 19 2015-03-10 Antti Koivisto <antti@apple.com> 2 20 -
trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp
r179007 r181392 30 30 #include <WebCore/FileSystem.h> 31 31 #include <glib.h> 32 33 #if defined(DEVELOPMENT_BUILD) 32 34 #include <wtf/gobject/GlibUtilities.h> 35 #endif 33 36 34 37 using namespace WebCore; … … 36 39 namespace WebKit { 37 40 41 #if defined(DEVELOPMENT_BUILD) 38 42 static String getExecutablePath() 39 43 { … … 43 47 return String(); 44 48 } 49 #endif 45 50 46 51 static String findWebKitProcess(const char* processName) 47 52 { 53 #if defined(DEVELOPMENT_BUILD) 48 54 static const char* execDirectory = g_getenv("WEBKIT_EXEC_PATH"); 49 55 if (execDirectory) { … … 59 65 return processPath; 60 66 } 67 #endif 61 68 62 69 return pathByAppendingComponent(filenameToString(LIBEXECDIR), processName); -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp
r180921 r181392 219 219 static const char* injectedBundleDirectory() 220 220 { 221 #if defined(DEVELOPMENT_BUILD) 221 222 const char* bundleDirectory = g_getenv("WEBKIT_INJECTED_BUNDLE_PATH"); 222 223 if (bundleDirectory && g_file_test(bundleDirectory, G_FILE_TEST_IS_DIR)) 223 224 return bundleDirectory; 225 #endif 224 226 225 227 static const char* injectedBundlePath = LIBDIR G_DIR_SEPARATOR_S "webkit2gtk-" WEBKITGTK_API_VERSION_STRING -
trunk/Source/cmake/OptionsGTK.cmake
r181321 r181392 249 249 add_definitions(-DWEBKITGTK_API_VERSION_STRING="${WEBKITGTK_API_VERSION}") 250 250 251 if (DEVELOPER_MODE) 252 add_definitions(-DDEVELOPMENT_BUILD=1) 253 endif () 254 251 255 if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO) 252 256 set(GSTREAMER_COMPONENTS app pbutils)
Note: See TracChangeset
for help on using the changeset viewer.