Changeset 80977 in webkit

Timestamp:

Mar 13, 2011 5:15:31 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-03-13 Joe Wild <​joseph.wild@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] QtLauncher does not load the same set of fonts as the DRT
​https://bugs.webkit.org/show_bug.cgi?id=34959

This patch adds the option "-use-test-fonts" to the QtTestBrowser.
When this option is used the webkit fonts are loaded the same
as they are in DumpRenderTree. This option can be used on
QtTestBrowser and run-launcher. It can only be used
on Linux systems with FcInit and is configured as such.

• QtTestBrowser/launcherwindow.h: (WindowOptions::WindowOptions):
• QtTestBrowser/main.cpp: (initWebKitTestFonts): (launcherMain): (LauncherApplication::handleUserOptions):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• QtTestBrowser/launcherwindow.h (modified) (2 diffs)
• QtTestBrowser/main.cpp (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-03-13  Joe Wild  <joseph.wild@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] QtLauncher does not load the same set of fonts as the DRT
+        https://bugs.webkit.org/show_bug.cgi?id=34959
+
+        This patch adds the option "-use-test-fonts" to the QtTestBrowser.
+        When this option is used the webkit fonts are loaded the same
+        as they are in DumpRenderTree.  This option can be used on
+        QtTestBrowser and run-launcher.  It can only be used
+        on Linux systems with FcInit and is configured as such.
+
+        * QtTestBrowser/launcherwindow.h:
+        (WindowOptions::WindowOptions):
+        * QtTestBrowser/main.cpp:
+        (initWebKitTestFonts):
+        (launcherMain):
+        (LauncherApplication::handleUserOptions):
+
 2011-03-12  Dan Bernstein  <mitz@apple.com>
 

trunk/Tools/QtTestBrowser/launcherwindow.h

@@ -101 +101 @@
         , useQGLWidgetViewport(false)
 #endif
+#if defined(Q_WS_X11)
+        , useTestFonts(false)
+#endif
     {
     }
@@ -119 +122 @@
 #if defined(QT_CONFIGURED_WITH_OPENGL)
     bool useQGLWidgetViewport;
+#endif
+#if defined(Q_WS_X11)
+    bool useTestFonts;
 #endif
     QUrl inspectorUrl;

trunk/Tools/QtTestBrowser/main.cpp

@@ -36 +36 @@
 WindowOptions windowOptions;
 
+
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QFontDatabase>
+
+
+#if defined(Q_WS_X11)
+#include <fontconfig/fontconfig.h>
+#endif
+
+
+#if defined(Q_WS_X11)
+// Very similar to WebCore::DumpRenderTree::initializeFonts();
+// Duplicated here so that QtTestBrowser would display contents
+// with the same fonts as run-webkit-tests/DumpRenderTree.
+static void initTestFonts()
+{
+    static int numFonts = -1;
+
+    // Some test cases may add or remove application fonts (via @font-face).
+    // Make sure to re-initialize the font set if necessary.
+    FcFontSet* appFontSet = FcConfigGetFonts(0, FcSetApplication);
+    if (appFontSet && numFonts >= 0 && appFontSet->nfont == numFonts)
+        return;
+
+    QByteArray fontDir = getenv("WEBKIT_TESTFONTS");
+    if (fontDir.isEmpty() || !QDir(fontDir).exists()) {
+        fprintf(stderr,
+                "\n\n"
+                "----------------------------------------------------------------------\n"
+                "WEBKIT_TESTFONTS environment variable is not set correctly.\n"
+                "This variable has to point to the directory containing the fonts\n"
+                "you can clone from git://gitorious.org/qtwebkit/testfonts.git\n"
+                "----------------------------------------------------------------------\n"
+               );
+        exit(1);
+    }
+    // Looks for qt/fonts.conf relative to the directory of the QtTestBrowser 
+    // executable.
+    QString configFileString = QCoreApplication::applicationDirPath();
+    configFileString += "/../../../Tools/DumpRenderTree/qt/fonts.conf";
+    QByteArray configFileArray = configFileString.toUtf8();
+    FcConfig* config = FcConfigCreate();
+    if (!FcConfigParseAndLoad (config, (FcChar8*) configFileArray.data(), true))
+        qFatal("Couldn't load font configuration file");
+    if (!FcConfigAppFontAddDir (config, (FcChar8*) fontDir.data()))
+        qFatal("Couldn't add font dir!");
+    FcConfigSetCurrent(config);
+
+    appFontSet = FcConfigGetFonts(config, FcSetApplication);
+    numFonts = appFontSet->nfont;
+}
+#endif
+
 int launcherMain(const QApplication& app)
 {
+#ifdef Q_WS_X11
+    if (windowOptions.useTestFonts)
+        initTestFonts();
+#endif
+
 #ifndef NDEBUG
     int retVal = app.exec();
@@ -131 +191 @@
              << "[-offline-web-application-cache-enabled]"
              << "[-set-offline-storage-default-quota maxSize]"
+#if defined(Q_WS_X11)
+             << "[-use-test-fonts]"
+#endif
              << "URLs";
         appQuit(0);
@@ -203 +266 @@
 #endif
 
+#if defined(Q_WS_X11)
+    if (args.contains("-use-test-fonts"))
+        windowOptions.useTestFonts = true;
+#endif
+
     QString inspectorUrlArg("-inspector-url");
     int inspectorUrlIndex = args.indexOf(inspectorUrlArg);