Ensure we check for WEBKIT_EXEC_PATH even without developer mode

pgorszkowski-igalia · spenap · commit d2ea27d4084f · 2025-06-10T14:04:54.000+01:00
diff --git a/Source/WebKit/Shared/glib/ProcessExecutablePathGLib.cpp b/Source/WebKit/Shared/glib/ProcessExecutablePathGLib.cpp
@@ -32,19 +32,16 @@
 
 namespace WebKit {
 
-#if ENABLE(DEVELOPER_MODE)
 static String getExecutablePath()
 {
     CString executablePath = FileSystem::currentExecutablePath();
     if (!executablePath.isNull())
         return FileSystem::parentPath(FileSystem::stringFromFileSystemRepresentation(executablePath.data()));
     return { };
 }
-#endif
 
 static String findWebKitProcess(const char* processName)
 {
-#if ENABLE(DEVELOPER_MODE)
     static const char* execDirectory = g_getenv("WEBKIT_EXEC_PATH");
     if (execDirectory) {
         String processPath = FileSystem::pathByAppendingComponent(FileSystem::stringFromFileSystemRepresentation(execDirectory), StringView::fromLatin1(processName));
@@ -58,7 +55,6 @@ static String findWebKitProcess(const char* processName)
         if (FileSystem::fileExists(processPath))
             return processPath;
     }
-#endif
 
     return FileSystem::pathByAppendingComponent(FileSystem::stringFromFileSystemRepresentation(PKGLIBEXECDIR), StringView::fromLatin1(processName));
 }

Original file line number	Diff line number	Diff line change
`@@ -32,19 +32,16 @@`
`32`	`32`
`33`	`33`	`namespace WebKit {`
`34`	`34`
`35`		`-#if ENABLE(DEVELOPER_MODE)`
`36`	`35`	`static String getExecutablePath()`
`37`	`36`	`{`
`38`	`37`	`CString executablePath = FileSystem::currentExecutablePath();`
`39`	`38`	`if (!executablePath.isNull())`
`40`	`39`	`return FileSystem::parentPath(FileSystem::stringFromFileSystemRepresentation(executablePath.data()));`
`41`	`40`	`return { };`
`42`	`41`	`}`
`43`		`-#endif`
`44`	`42`
`45`	`43`	`static String findWebKitProcess(const char* processName)`
`46`	`44`	`{`
`47`		`-#if ENABLE(DEVELOPER_MODE)`
`48`	`45`	`static const char* execDirectory = g_getenv("WEBKIT_EXEC_PATH");`
`49`	`46`	`if (execDirectory) {`
`50`	`47`	`String processPath = FileSystem::pathByAppendingComponent(FileSystem::stringFromFileSystemRepresentation(execDirectory), StringView::fromLatin1(processName));`
`@@ -58,7 +55,6 @@ static String findWebKitProcess(const char* processName)`
`58`	`55`	`if (FileSystem::fileExists(processPath))`
`59`	`56`	`return processPath;`
`60`	`57`	`}`
`61`		`-#endif`
`62`	`58`
`63`	`59`	`return FileSystem::pathByAppendingComponent(FileSystem::stringFromFileSystemRepresentation(PKGLIBEXECDIR), StringView::fromLatin1(processName));`
`64`	`60`	`}`