Title: [113321] trunk/Tools
- Revision
- 113321
- Author
- [email protected]
- Date
- 2012-04-05 08:32:12 -0700 (Thu, 05 Apr 2012)
Log Message
[Qt] WK1/WK2 layout test results are diverging
https://bugs.webkit.org/show_bug.cgi?id=82720
The resolving of default font families was altered in Qt5.
This directly affects the font picked by DRT for layout
tests. Since we want to keep the Qt4 and Qt5 results in line,
we can trick DRT in picking the same font as before for now.
Patch by Pierre Rossi <[email protected]> on 2012-04-05
Reviewed by Csaba Osztrogonác.
* DumpRenderTree/qt/QtInitializeTestFonts.cpp:
(WebKit::initializeTestFonts):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (113320 => 113321)
--- trunk/Tools/ChangeLog 2012-04-05 14:44:26 UTC (rev 113320)
+++ trunk/Tools/ChangeLog 2012-04-05 15:32:12 UTC (rev 113321)
@@ -1,3 +1,18 @@
+2012-04-05 Pierre Rossi <[email protected]>
+
+ [Qt] WK1/WK2 layout test results are diverging
+ https://bugs.webkit.org/show_bug.cgi?id=82720
+
+ The resolving of default font families was altered in Qt5.
+ This directly affects the font picked by DRT for layout
+ tests. Since we want to keep the Qt4 and Qt5 results in line,
+ we can trick DRT in picking the same font as before for now.
+
+ Reviewed by Csaba Osztrogonác.
+
+ * DumpRenderTree/qt/QtInitializeTestFonts.cpp:
+ (WebKit::initializeTestFonts):
+
2012-04-05 Kinuko Yasuda <[email protected]>
Expose DataTransferItem.getAsEntry() to allow users access dropped files as FileEntry
Modified: trunk/Tools/DumpRenderTree/qt/QtInitializeTestFonts.cpp (113320 => 113321)
--- trunk/Tools/DumpRenderTree/qt/QtInitializeTestFonts.cpp 2012-04-05 14:44:26 UTC (rev 113320)
+++ trunk/Tools/DumpRenderTree/qt/QtInitializeTestFonts.cpp 2012-04-05 15:32:12 UTC (rev 113321)
@@ -62,10 +62,19 @@
);
}
- QByteArray configFile = fontDir + "/fonts.conf";
+ QByteArray configFile;
FcConfig* config = FcConfigCreate();
+ // The resolving of default font families was altered in Qt5 with 2cc5442 (qtbase),
+ // we use this hack to keep resolving to the same font Qt4 did for serif while
+ // supporting both versions.
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+ configFile = fontDir + "/fonts-qt5-wk1.conf";
if (!FcConfigParseAndLoad(config, reinterpret_cast<const FcChar8*>(configFile.constData()), FcTrue))
qFatal("Couldn't load font configuration file");
+#endif
+ configFile = fontDir + "/fonts.conf";
+ if (!FcConfigParseAndLoad(config, reinterpret_cast<const FcChar8*>(configFile.constData()), FcTrue))
+ qFatal("Couldn't load font configuration file");
if (!FcConfigAppFontAddDir(config, reinterpret_cast<const FcChar8*>(fontDir.data())))
qFatal("Couldn't add font dir!");
FcConfigSetCurrent(config);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
