Title: [225671] trunk/Tools
- Revision
- 225671
- Author
- [email protected]
- Date
- 2017-12-07 23:47:18 -0800 (Thu, 07 Dec 2017)
Log Message
Unreviewed GTK+ and WPE build fix.
Add TestRunner::installFakeHelvetica(), WTR::installFakeHelvetica()
and WTF::uninstallFakeHelvetica() definitions, filling out the
declarations added in r225641. This fills up missing symbols in the
WKTR's InjectedBundle library, unbreaking layout tests for both
configurations.
* WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp:
(WTR::installFakeHelvetica):
(WTR::uninstallFakeHelvetica):
* WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp:
(WTR::TestRunner::inspectorTestStubURL):
(WTR::TestRunner::installFakeHelvetica):
* WebKitTestRunner/InjectedBundle/wpe/ActivateFontsWPE.cpp:
(WTR::installFakeHelvetica):
(WTR::uninstallFakeHelvetica):
* WebKitTestRunner/InjectedBundle/wpe/TestRunnerWPE.cpp:
(WTR::TestRunner::installFakeHelvetica):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (225670 => 225671)
--- trunk/Tools/ChangeLog 2017-12-08 04:50:48 UTC (rev 225670)
+++ trunk/Tools/ChangeLog 2017-12-08 07:47:18 UTC (rev 225671)
@@ -1,3 +1,25 @@
+2017-12-07 Zan Dobersek <[email protected]>
+
+ Unreviewed GTK+ and WPE build fix.
+
+ Add TestRunner::installFakeHelvetica(), WTR::installFakeHelvetica()
+ and WTF::uninstallFakeHelvetica() definitions, filling out the
+ declarations added in r225641. This fills up missing symbols in the
+ WKTR's InjectedBundle library, unbreaking layout tests for both
+ configurations.
+
+ * WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp:
+ (WTR::installFakeHelvetica):
+ (WTR::uninstallFakeHelvetica):
+ * WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp:
+ (WTR::TestRunner::inspectorTestStubURL):
+ (WTR::TestRunner::installFakeHelvetica):
+ * WebKitTestRunner/InjectedBundle/wpe/ActivateFontsWPE.cpp:
+ (WTR::installFakeHelvetica):
+ (WTR::uninstallFakeHelvetica):
+ * WebKitTestRunner/InjectedBundle/wpe/TestRunnerWPE.cpp:
+ (WTR::TestRunner::installFakeHelvetica):
+
2017-12-07 Yusuke Suzuki <[email protected]>
Use StaticLock instead of NeverDestroyed<Lock>
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp (225670 => 225671)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp 2017-12-08 04:50:48 UTC (rev 225670)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp 2017-12-08 07:47:18 UTC (rev 225671)
@@ -155,4 +155,12 @@
initializeFontConfigSetting();
}
+void installFakeHelvetica(WKStringRef)
+{
}
+
+void uninstallFakeHelvetica()
+{
+}
+
+}
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp (225670 => 225671)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp 2017-12-08 04:50:48 UTC (rev 225670)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp 2017-12-08 07:47:18 UTC (rev 225671)
@@ -27,6 +27,7 @@
#include "config.h"
#include "TestRunner.h"
+#include "ActivateFonts.h"
#include "InjectedBundle.h"
#include "InjectedBundleUtilities.h"
#include <glib.h>
@@ -71,4 +72,9 @@
return JSStringCreateWithUTF8CString("resource:///org/webkitgtk/inspector/UserInterface/TestStub.html");
}
+void TestRunner::installFakeHelvetica(JSStringRef configuration)
+{
+ WTR::installFakeHelvetica(toWK(configuration).get());
+}
+
} // namespace WTR
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/wpe/ActivateFontsWPE.cpp (225670 => 225671)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/wpe/ActivateFontsWPE.cpp 2017-12-08 04:50:48 UTC (rev 225670)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/wpe/ActivateFontsWPE.cpp 2017-12-08 07:47:18 UTC (rev 225671)
@@ -142,4 +142,12 @@
numFonts = FcConfigGetFonts(config, FcSetApplication)->nfont;
}
+void installFakeHelvetica(WKStringRef)
+{
+}
+
+void uninstallFakeHelvetica()
+{
+}
+
} // namespace WTR
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/wpe/TestRunnerWPE.cpp (225670 => 225671)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/wpe/TestRunnerWPE.cpp 2017-12-08 04:50:48 UTC (rev 225670)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/wpe/TestRunnerWPE.cpp 2017-12-08 07:47:18 UTC (rev 225671)
@@ -53,5 +53,9 @@
m_waitToDumpWatchdogTimer.startOneShot(m_timeout / 1000.0);
}
+void TestRunner::installFakeHelvetica(JSStringRef configuration)
+{
+ WTR::installFakeHelvetica(toWK(configuration).get());
+}
} // namespace WTR
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
