Diff
Modified: trunk/Tools/ChangeLog (288652 => 288653)
--- trunk/Tools/ChangeLog 2022-01-27 00:03:15 UTC (rev 288652)
+++ trunk/Tools/ChangeLog 2022-01-27 00:07:08 UTC (rev 288653)
@@ -1,3 +1,26 @@
+2022-01-26 Don Olmstead <[email protected]>
+
+ Share TestRunner::installFakeHelvetica implementation
+ https://bugs.webkit.org/show_bug.cgi?id=235657
+
+ Reviewed by Darin Adler.
+
+ The implementation of TestRunner::installFakeHelvetica was the same for each port. It just
+ calls into the WTR::installFakeHelvetica function defined in ActivateFonts.h which does the
+ actual work of installing the font.
+
+ * WebKitTestRunner/InjectedBundle/ActivateFonts.h:
+ * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+ (WTR::TestRunner::installFakeHelvetica):
+ * WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp:
+ (WTR::TestRunner::installFakeHelvetica): Deleted.
+ * WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm:
+ (WTR::TestRunner::installFakeHelvetica): Deleted.
+ * WebKitTestRunner/InjectedBundle/win/TestRunnerWin.cpp:
+ (WTR::TestRunner::installFakeHelvetica): Deleted.
+ * WebKitTestRunner/InjectedBundle/wpe/TestRunnerWPE.cpp:
+ (WTR::TestRunner::installFakeHelvetica): Deleted.
+
2022-01-25 Jonathan Bedard <[email protected]>
[EWS] Support pull requests in built product management
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/ActivateFonts.h (288652 => 288653)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/ActivateFonts.h 2022-01-27 00:03:15 UTC (rev 288652)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/ActivateFonts.h 2022-01-27 00:07:08 UTC (rev 288653)
@@ -23,8 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef ActivateFonts_h
-#define ActivateFonts_h
+#pragma once
namespace WTR {
@@ -33,5 +32,3 @@
void uninstallFakeHelvetica();
} // namespace WTR
-
-#endif // ActivateFonts_h
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (288652 => 288653)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2022-01-27 00:03:15 UTC (rev 288652)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2022-01-27 00:07:08 UTC (rev 288653)
@@ -26,6 +26,7 @@
#include "config.h"
#include "TestRunner.h"
+#include "ActivateFonts.h"
#include "DictionaryFunctions.h"
#include "InjectedBundle.h"
#include "InjectedBundlePage.h"
@@ -1984,6 +1985,11 @@
callTestRunnerCallback(GetApplicationManifestCallbackID);
}
+void TestRunner::installFakeHelvetica(JSStringRef configuration)
+{
+ WTR::installFakeHelvetica(toWK(configuration).get());
+}
+
void TestRunner::performCustomMenuAction()
{
callTestRunnerCallback(CustomMenuActionCallbackID);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp (288652 => 288653)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp 2022-01-27 00:03:15 UTC (rev 288652)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp 2022-01-27 00:07:08 UTC (rev 288653)
@@ -27,7 +27,6 @@
#include "config.h"
#include "TestRunner.h"
-#include "ActivateFonts.h"
#include "InjectedBundle.h"
#include "InjectedBundleUtilities.h"
#include <glib.h>
@@ -59,9 +58,4 @@
return JSStringCreateWithUTF8CString("resource:///org/webkit/inspector/UserInterface/TestStub.html");
}
-void TestRunner::installFakeHelvetica(JSStringRef configuration)
-{
- WTR::installFakeHelvetica(toWK(configuration).get());
-}
-
} // namespace WTR
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm (288652 => 288653)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm 2022-01-27 00:03:15 UTC (rev 288652)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm 2022-01-27 00:07:08 UTC (rev 288653)
@@ -26,7 +26,6 @@
#import "config.h"
#import "TestRunner.h"
-#import "ActivateFonts.h"
#import "InjectedBundle.h"
#import <_javascript_Core/JSStringRefCF.h>
@@ -54,9 +53,4 @@
#endif
}
-void TestRunner::installFakeHelvetica(JSStringRef configuration)
-{
- WTR::installFakeHelvetica(toWK(configuration).get());
-}
-
} // namespace WTR
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/win/TestRunnerWin.cpp (288652 => 288653)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/win/TestRunnerWin.cpp 2022-01-27 00:03:15 UTC (rev 288652)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/win/TestRunnerWin.cpp 2022-01-27 00:07:08 UTC (rev 288653)
@@ -26,7 +26,6 @@
#include "config.h"
#include "TestRunner.h"
-#include "ActivateFonts.h"
#include <shlwapi.h>
#include <wininet.h>
@@ -64,9 +63,4 @@
{
}
-void TestRunner::installFakeHelvetica(JSStringRef configuration)
-{
- WTR::installFakeHelvetica(toWK(configuration).get());
-}
-
} // namespace WTR
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/wpe/TestRunnerWPE.cpp (288652 => 288653)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/wpe/TestRunnerWPE.cpp 2022-01-27 00:03:15 UTC (rev 288652)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/wpe/TestRunnerWPE.cpp 2022-01-27 00:07:08 UTC (rev 288653)
@@ -26,8 +26,6 @@
#include "config.h"
#include "TestRunner.h"
-#include "ActivateFonts.h"
-
namespace WTR {
JSRetainPtr<JSStringRef> TestRunner::pathToLocalResource(JSStringRef)
@@ -44,9 +42,4 @@
{
}
-void TestRunner::installFakeHelvetica(JSStringRef configuration)
-{
- WTR::installFakeHelvetica(toWK(configuration).get());
-}
-
} // namespace WTR
