Diff
Modified: trunk/Source/WTF/ChangeLog (284155 => 284156)
--- trunk/Source/WTF/ChangeLog 2021-10-14 13:02:16 UTC (rev 284155)
+++ trunk/Source/WTF/ChangeLog 2021-10-14 13:20:38 UTC (rev 284156)
@@ -1,3 +1,21 @@
+2021-10-14 Carlos Garcia Campos <[email protected]>
+
+ [GTK][WPE] Move getCurrentExecutablePath() and getCurrentExecutableName() to FileSystem
+ https://bugs.webkit.org/show_bug.cgi?id=231732
+
+ Reviewed by Michael Catanzaro.
+
+ * wtf/FileSystem.h:
+ * wtf/PlatformGTK.cmake:
+ * wtf/PlatformWPE.cmake:
+ * wtf/glib/FileSystemGlib.cpp:
+ (WTF::FileSystemImpl::currentExecutablePath):
+ (WTF::FileSystemImpl::currentExecutableName):
+ * wtf/glib/GLibUtilities.cpp: Removed.
+ (getCurrentExecutablePath): Deleted.
+ (getCurrentExecutableName): Deleted.
+ * wtf/glib/GLibUtilities.h: Removed.
+
2021-10-14 Tim Nguyen <[email protected]>
Enable <dialog> element by default
Modified: trunk/Source/WTF/wtf/FileSystem.h (284155 => 284156)
--- trunk/Source/WTF/wtf/FileSystem.h 2021-10-14 13:02:16 UTC (rev 284155)
+++ trunk/Source/WTF/wtf/FileSystem.h 2021-10-14 13:20:38 UTC (rev 284156)
@@ -189,6 +189,8 @@
#if USE(GLIB)
WTF_EXPORT_PRIVATE String filenameForDisplay(const String&);
+WTF_EXPORT_PRIVATE CString currentExecutablePath();
+WTF_EXPORT_PRIVATE CString currentExecutableName();
#endif
#if OS(WINDOWS)
Modified: trunk/Source/WTF/wtf/OptionSet.h (284155 => 284156)
--- trunk/Source/WTF/wtf/OptionSet.h 2021-10-14 13:02:16 UTC (rev 284155)
+++ trunk/Source/WTF/wtf/OptionSet.h 2021-10-14 13:20:38 UTC (rev 284156)
@@ -31,6 +31,7 @@
#include <type_traits>
#include <wtf/Assertions.h>
#include <wtf/EnumTraits.h>
+#include <wtf/FastMalloc.h>
#include <wtf/MathExtras.h>
#include <wtf/StdLibExtras.h>
Modified: trunk/Source/WTF/wtf/PlatformGTK.cmake (284155 => 284156)
--- trunk/Source/WTF/wtf/PlatformGTK.cmake 2021-10-14 13:02:16 UTC (rev 284155)
+++ trunk/Source/WTF/wtf/PlatformGTK.cmake 2021-10-14 13:20:38 UTC (rev 284156)
@@ -2,7 +2,6 @@
list(APPEND WTF_PUBLIC_HEADERS
glib/ChassisType.h
- glib/GLibUtilities.h
glib/GMutexLocker.h
glib/GRefPtr.h
glib/GSocketMonitor.h
@@ -30,7 +29,6 @@
glib/ChassisType.cpp
glib/FileSystemGlib.cpp
- glib/GLibUtilities.cpp
glib/GRefPtr.cpp
glib/GSocketMonitor.cpp
glib/RunLoopGLib.cpp
Modified: trunk/Source/WTF/wtf/PlatformWPE.cmake (284155 => 284156)
--- trunk/Source/WTF/wtf/PlatformWPE.cmake 2021-10-14 13:02:16 UTC (rev 284155)
+++ trunk/Source/WTF/wtf/PlatformWPE.cmake 2021-10-14 13:20:38 UTC (rev 284156)
@@ -1,6 +1,5 @@
list(APPEND WTF_PUBLIC_HEADERS
glib/ChassisType.h
- glib/GLibUtilities.h
glib/GMutexLocker.h
glib/GRefPtr.h
glib/GSocketMonitor.h
@@ -21,7 +20,6 @@
glib/ChassisType.cpp
glib/FileSystemGlib.cpp
- glib/GLibUtilities.cpp
glib/GRefPtr.cpp
glib/GSocketMonitor.cpp
glib/RunLoopGLib.cpp
Modified: trunk/Source/WTF/wtf/glib/FileSystemGlib.cpp (284155 => 284156)
--- trunk/Source/WTF/wtf/glib/FileSystemGlib.cpp 2021-10-14 13:02:16 UTC (rev 284155)
+++ trunk/Source/WTF/wtf/glib/FileSystemGlib.cpp 2021-10-14 13:20:38 UTC (rev 284156)
@@ -30,7 +30,6 @@
#include <sys/file.h>
#include <wtf/EnumTraits.h>
#include <wtf/UUID.h>
-#include <wtf/glib/GLibUtilities.h>
#include <wtf/glib/GRefPtr.h>
#include <wtf/glib/GUniquePtr.h>
#include <wtf/text/ASCIIFastPath.h>
@@ -38,6 +37,13 @@
#include <wtf/text/StringBuilder.h>
#include <wtf/text/WTFString.h>
+#if OS(WINDOWS)
+#include <windows.h>
+#else
+#include <limits.h>
+#include <unistd.h>
+#endif
+
namespace WTF {
namespace FileSystemImpl {
@@ -275,5 +281,52 @@
}
#endif // USE(FILE_LOCK)
+#if OS(LINUX)
+CString currentExecutablePath()
+{
+ static char readLinkBuffer[PATH_MAX];
+ ssize_t result = readlink("/proc/self/exe", readLinkBuffer, PATH_MAX);
+ if (result == -1)
+ return { };
+ return CString(readLinkBuffer, result);
+}
+#elif OS(HURD)
+CString currentExecutablePath()
+{
+ return { };
+}
+#elif OS(UNIX)
+CString currentExecutablePath()
+{
+ static char readLinkBuffer[PATH_MAX];
+ ssize_t result = readlink("/proc/curproc/file", readLinkBuffer, PATH_MAX);
+ if (result == -1)
+ return { };
+ return CString(readLinkBuffer, result);
+}
+#elif OS(WINDOWS)
+CString currentExecutablePath()
+{
+ static WCHAR buffer[MAX_PATH];
+ DWORD length = GetModuleFileNameW(0, buffer, MAX_PATH);
+ if (!length || (length == MAX_PATH && GetLastError() == ERROR_INSUFFICIENT_BUFFER))
+ return { };
+
+ String path(buffer, length);
+ return path.utf8();
+}
+#endif
+
+CString currentExecutableName()
+{
+ auto executablePath = currentExecutablePath();
+ if (!executablePath.isNull()) {
+ GUniquePtr<char> basename(g_path_get_basename(executablePath.data()));
+ return basename.get();
+ }
+
+ return g_get_prgname();
+}
+
} // namespace FileSystemImpl
} // namespace WTF
Deleted: trunk/Source/WTF/wtf/glib/GLibUtilities.cpp (284155 => 284156)
--- trunk/Source/WTF/wtf/glib/GLibUtilities.cpp 2021-10-14 13:02:16 UTC (rev 284155)
+++ trunk/Source/WTF/wtf/glib/GLibUtilities.cpp 2021-10-14 13:20:38 UTC (rev 284156)
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2010 Igalia, S.L.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-#include <wtf/glib/GLibUtilities.h>
-
-#include <glib.h>
-#include <wtf/glib/GUniquePtr.h>
-
-#if OS(WINDOWS)
-#include <windows.h>
-#include <wtf/text/WTFString.h>
-#else
-#include <limits.h>
-#include <unistd.h>
-#endif
-
-#if OS(LINUX)
-CString getCurrentExecutablePath()
-{
- static char readLinkBuffer[PATH_MAX];
- ssize_t result = readlink("/proc/self/exe", readLinkBuffer, PATH_MAX);
- if (result == -1)
- return CString();
- return CString(readLinkBuffer, result);
-}
-#elif OS(HURD)
-CString getCurrentExecutablePath()
-{
- return CString();
-}
-#elif OS(UNIX)
-CString getCurrentExecutablePath()
-{
- static char readLinkBuffer[PATH_MAX];
- ssize_t result = readlink("/proc/curproc/file", readLinkBuffer, PATH_MAX);
- if (result == -1)
- return CString();
- return CString(readLinkBuffer, result);
-}
-#elif OS(WINDOWS)
-CString getCurrentExecutablePath()
-{
- static WCHAR buffer[MAX_PATH];
- DWORD length = GetModuleFileNameW(0, buffer, MAX_PATH);
- if (!length || (length == MAX_PATH && GetLastError() == ERROR_INSUFFICIENT_BUFFER))
- return CString();
-
- String path(buffer, length);
- return path.utf8();
-}
-#endif
-
-CString getCurrentExecutableName()
-{
- auto executablePath = getCurrentExecutablePath();
- if (!executablePath.isNull()) {
- GUniquePtr<char> basename(g_path_get_basename(executablePath.data()));
- return basename.get();
- }
-
- return g_get_prgname();
-}
Deleted: trunk/Source/WTF/wtf/glib/GLibUtilities.h (284155 => 284156)
--- trunk/Source/WTF/wtf/glib/GLibUtilities.h 2021-10-14 13:02:16 UTC (rev 284155)
+++ trunk/Source/WTF/wtf/glib/GLibUtilities.h 2021-10-14 13:20:38 UTC (rev 284156)
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2010 Igalia, S.L.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef GLibUtilities_h
-#define GLibUtilities_h
-
-#include <glib-object.h>
-#include <wtf/Assertions.h>
-#include <wtf/text/CString.h>
-
-WTF_EXPORT_PRIVATE CString getCurrentExecutablePath();
-WTF_EXPORT_PRIVATE CString getCurrentExecutableName();
-
-#endif
Modified: trunk/Source/WebCore/ChangeLog (284155 => 284156)
--- trunk/Source/WebCore/ChangeLog 2021-10-14 13:02:16 UTC (rev 284155)
+++ trunk/Source/WebCore/ChangeLog 2021-10-14 13:20:38 UTC (rev 284156)
@@ -1,3 +1,17 @@
+2021-10-14 Carlos Garcia Campos <[email protected]>
+
+ [GTK][WPE] Move getCurrentExecutablePath() and getCurrentExecutableName() to FileSystem
+ https://bugs.webkit.org/show_bug.cgi?id=231732
+
+ Reviewed by Michael Catanzaro.
+
+ * platform/graphics/gstreamer/GStreamerCommon.cpp:
+ (WebCore::ensureGStreamerInitialized):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ * platform/graphics/gstreamer/mse/AppendPipeline.cpp:
+ * platform/text/hyphen/HyphenationLibHyphen.cpp:
+ (WebCore::topLevelPath):
+
2021-10-14 Rob Buis <[email protected]>
Refactor RenderSVGBlock
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp (284155 => 284156)
--- trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp 2021-10-14 13:02:16 UTC (rev 284155)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp 2021-10-14 13:20:38 UTC (rev 284156)
@@ -33,8 +33,8 @@
#include <gst/audio/audio-info.h>
#include <gst/gst.h>
#include <mutex>
+#include <wtf/FileSystem.h>
#include <wtf/Scope.h>
-#include <wtf/glib/GLibUtilities.h>
#include <wtf/glib/GUniquePtr.h>
#include <wtf/glib/RunLoopSourcePriority.h>
@@ -257,7 +257,7 @@
s_UIProcessCommandLineOptions.reset();
char** argv = g_new0(char*, parameters.size() + 2);
int argc = parameters.size() + 1;
- argv[0] = g_strdup(getCurrentExecutableName().data());
+ argv[0] = g_strdup(FileSystem::currentExecutableName().data());
for (unsigned i = 0; i < parameters.size(); i++)
argv[i + 1] = g_strdup(parameters[i].utf8().data());
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (284155 => 284156)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2021-10-14 13:02:16 UTC (rev 284155)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2021-10-14 13:20:38 UTC (rev 284156)
@@ -82,7 +82,6 @@
#include <gst/video/gstvideometa.h>
#include <limits>
#include <wtf/FileSystem.h>
-#include <wtf/glib/GLibUtilities.h>
#include <wtf/glib/GUniquePtr.h>
#include <wtf/glib/RunLoopSourcePriority.h>
#include <wtf/MathExtras.h>
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp (284155 => 284156)
--- trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp 2021-10-14 13:02:16 UTC (rev 284155)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp 2021-10-14 13:20:38 UTC (rev 284156)
@@ -42,7 +42,6 @@
#include <gst/pbutils/pbutils.h>
#include <gst/video/video.h>
#include <wtf/Condition.h>
-#include <wtf/glib/GLibUtilities.h>
#include <wtf/glib/RunLoopSourcePriority.h>
#include <wtf/text/StringConcatenateNumbers.h>
Modified: trunk/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp (284155 => 284156)
--- trunk/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp 2021-10-14 13:02:16 UTC (rev 284155)
+++ trunk/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp 2021-10-14 13:20:38 UTC (rev 284156)
@@ -41,7 +41,6 @@
#include <wtf/text/StringView.h>
#if PLATFORM(GTK)
-#include <wtf/glib/GLibUtilities.h>
#include <wtf/glib/GUniquePtr.h>
#endif
@@ -103,7 +102,7 @@
// If the environment variable wasn't provided then assume we were built into
// WebKitBuild/Debug or WebKitBuild/Release. Obviously this will fail if the build
// directory is non-standard, but we can't do much more about this.
- GUniquePtr<char> parentPath(g_path_get_dirname(getCurrentExecutablePath().data()));
+ GUniquePtr<char> parentPath(g_path_get_dirname(FileSystem::currentExecutablePath().data()));
GUniquePtr<char> layoutTestsPath(g_build_filename(parentPath.get(), "..", "..", "..", nullptr));
GUniquePtr<char> absoluteTopLevelPath(realpath(layoutTestsPath.get(), 0));
return absoluteTopLevelPath.get();
Modified: trunk/Source/WebKit/ChangeLog (284155 => 284156)
--- trunk/Source/WebKit/ChangeLog 2021-10-14 13:02:16 UTC (rev 284155)
+++ trunk/Source/WebKit/ChangeLog 2021-10-14 13:20:38 UTC (rev 284156)
@@ -1,3 +1,16 @@
+2021-10-14 Carlos Garcia Campos <[email protected]>
+
+ [GTK][WPE] Move getCurrentExecutablePath() and getCurrentExecutableName() to FileSystem
+ https://bugs.webkit.org/show_bug.cgi?id=231732
+
+ Reviewed by Michael Catanzaro.
+
+ * Shared/glib/ProcessExecutablePathGLib.cpp:
+ (WebKit::getExecutablePath):
+ * UIProcess/Launcher/glib/BubblewrapLauncher.cpp:
+ (WebKit::bubblewrapSpawn):
+ * UIProcess/Launcher/glib/ProcessLauncherGLib.cpp:
+
2021-10-13 Chris Dumez <[email protected]>
Drop makeWeakPtr() and use WeakPtr { } directly
Modified: trunk/Source/WebKit/Shared/glib/ProcessExecutablePathGLib.cpp (284155 => 284156)
--- trunk/Source/WebKit/Shared/glib/ProcessExecutablePathGLib.cpp 2021-10-14 13:02:16 UTC (rev 284155)
+++ trunk/Source/WebKit/Shared/glib/ProcessExecutablePathGLib.cpp 2021-10-14 13:20:38 UTC (rev 284156)
@@ -29,7 +29,6 @@
#include <glib.h>
#include <wtf/FileSystem.h>
-#include <wtf/glib/GLibUtilities.h>
namespace WebKit {
@@ -36,7 +35,7 @@
#if ENABLE(DEVELOPER_MODE)
static String getExecutablePath()
{
- CString executablePath = getCurrentExecutablePath();
+ CString executablePath = FileSystem::currentExecutablePath();
if (!executablePath.isNull())
return FileSystem::parentPath(FileSystem::stringFromFileSystemRepresentation(executablePath.data()));
return { };
Modified: trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp (284155 => 284156)
--- trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2021-10-14 13:02:16 UTC (rev 284155)
+++ trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2021-10-14 13:20:38 UTC (rev 284156)
@@ -28,7 +28,6 @@
#include <unistd.h>
#include <wtf/FileSystem.h>
#include <wtf/UniStdExtras.h>
-#include <wtf/glib/GLibUtilities.h>
#include <wtf/glib/GRefPtr.h>
#include <wtf/glib/GUniquePtr.h>
@@ -931,7 +930,7 @@
bindIfExists(sandboxArgs, parentDir.utf8().data());
}
- CString executablePath = getCurrentExecutablePath();
+ CString executablePath = FileSystem::currentExecutablePath();
if (!executablePath.isNull()) {
// Our executable is `/foo/bar/bin/Process`, we want `/foo/bar` as a usable prefix
String parentDir = FileSystem::parentPath(FileSystem::parentPath(FileSystem::stringFromFileSystemRepresentation(executablePath.data())));
Modified: trunk/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp (284155 => 284156)
--- trunk/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp 2021-10-14 13:02:16 UTC (rev 284155)
+++ trunk/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp 2021-10-14 13:20:38 UTC (rev 284156)
@@ -37,7 +37,6 @@
#include <wtf/FileSystem.h>
#include <wtf/RunLoop.h>
#include <wtf/UniStdExtras.h>
-#include <wtf/glib/GLibUtilities.h>
#include <wtf/glib/GUniquePtr.h>
#include <wtf/text/CString.h>
#include <wtf/text/WTFString.h>
Modified: trunk/Tools/ChangeLog (284155 => 284156)
--- trunk/Tools/ChangeLog 2021-10-14 13:02:16 UTC (rev 284155)
+++ trunk/Tools/ChangeLog 2021-10-14 13:20:38 UTC (rev 284156)
@@ -1,3 +1,18 @@
+2021-10-14 Carlos Garcia Campos <[email protected]>
+
+ [GTK][WPE] Move getCurrentExecutablePath() and getCurrentExecutableName() to FileSystem
+ https://bugs.webkit.org/show_bug.cgi?id=231732
+
+ Reviewed by Michael Catanzaro.
+
+ * TestWebKitAPI/glib/WebKitGLib/TestMain.cpp:
+ (main):
+ * WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp:
+ * WebKitTestRunner/InjectedBundle/gtk/InjectedBundleUtilities.cpp:
+ (WTR::topLevelPath):
+ * WebKitTestRunner/InjectedBundle/wpe/ActivateFontsWPE.cpp:
+ (WTR::topLevelPath):
+
2021-10-13 Chris Dumez <[email protected]>
Drop makeWeakPtr() and use WeakPtr { } directly
Modified: trunk/Tools/TestWebKitAPI/glib/WebKitGLib/TestMain.cpp (284155 => 284156)
--- trunk/Tools/TestWebKitAPI/glib/WebKitGLib/TestMain.cpp 2021-10-14 13:02:16 UTC (rev 284155)
+++ trunk/Tools/TestWebKitAPI/glib/WebKitGLib/TestMain.cpp 2021-10-14 13:20:38 UTC (rev 284156)
@@ -21,7 +21,7 @@
#include "TestMain.h"
#include <glib/gstdio.h>
-#include <wtf/glib/GLibUtilities.h>
+#include <wtf/FileSystem.h>
#if PLATFORM(GTK)
#include <gtk/gtk.h>
@@ -124,7 +124,7 @@
#else
g_test_init(&argc, &argv, nullptr);
#endif
- g_set_prgname(getCurrentExecutableName().data());
+ g_set_prgname(FileSystem::currentExecutableName().data());
g_setenv("WEBKIT_EXEC_PATH", WEBKIT_EXEC_PATH, FALSE);
g_setenv("WEBKIT_INJECTED_BUNDLE_PATH", WEBKIT_INJECTED_BUNDLE_PATH, FALSE);
g_setenv("LC_ALL", "C", TRUE);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp (284155 => 284156)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp 2021-10-14 13:02:16 UTC (rev 284155)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp 2021-10-14 13:20:38 UTC (rev 284156)
@@ -34,7 +34,6 @@
#include "InjectedBundleUtilities.h"
#include <fontconfig/fontconfig.h>
#include <gtk/gtk.h>
-#include <wtf/glib/GLibUtilities.h>
#include <wtf/glib/GUniquePtr.h>
namespace WTR {
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/InjectedBundleUtilities.cpp (284155 => 284156)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/InjectedBundleUtilities.cpp 2021-10-14 13:02:16 UTC (rev 284155)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/InjectedBundleUtilities.cpp 2021-10-14 13:20:38 UTC (rev 284156)
@@ -30,7 +30,7 @@
#include "InjectedBundleUtilities.h"
#include <gtk/gtk.h>
-#include <wtf/glib/GLibUtilities.h>
+#include <wtf/FileSystem.h>
#include <wtf/glib/GUniquePtr.h>
namespace WTR {
@@ -43,7 +43,7 @@
// If the environment variable wasn't provided then assume we were built into
// WebKitBuild/Debug or WebKitBuild/Release. Obviously this will fail if the build
// directory is non-standard, but we can't do much more about this.
- GUniquePtr<char> parentPath(g_path_get_dirname(getCurrentExecutablePath().data()));
+ GUniquePtr<char> parentPath(g_path_get_dirname(FileSystem::currentExecutablePath().data()));
GUniquePtr<char> layoutTestsPath(g_build_filename(parentPath.get(), "..", "..", "..", nullptr));
GUniquePtr<char> absoluteTopLevelPath(realpath(layoutTestsPath.get(), 0));
return absoluteTopLevelPath.get();
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/wpe/ActivateFontsWPE.cpp (284155 => 284156)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/wpe/ActivateFontsWPE.cpp 2021-10-14 13:02:16 UTC (rev 284155)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/wpe/ActivateFontsWPE.cpp 2021-10-14 13:20:38 UTC (rev 284156)
@@ -27,7 +27,7 @@
#include "ActivateFonts.h"
#include <fontconfig/fontconfig.h>
-#include <wtf/glib/GLibUtilities.h>
+#include <wtf/FileSystem.h>
#include <wtf/glib/GUniquePtr.h>
namespace WTR {
@@ -40,7 +40,7 @@
// If the environment variable wasn't provided then assume we were built into
// WebKitBuild/Debug or WebKitBuild/Release. Obviously this will fail if the build
// directory is non-standard, but we can't do much more about this.
- GUniquePtr<char> parentPath(g_path_get_dirname(getCurrentExecutablePath().data()));
+ GUniquePtr<char> parentPath(g_path_get_dirname(FileSystem::currentExecutablePath().data()));
GUniquePtr<char> layoutTestsPath(g_build_filename(parentPath.get(), "..", "..", "..", nullptr));
GUniquePtr<char> absoluteTopLevelPath(realpath(layoutTestsPath.get(), 0));
return absoluteTopLevelPath.get();
