Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)

New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.

1 files changed, 4 insertions, 6 deletions

diff --git a/Tools/WebKitTestRunner/InjectedBundle/qt/TestRunnerQt.cpp b/Tools/WebKitTestRunner/InjectedBundle/qt/TestRunnerQt.cpp
index f5d149b3d..1671ac73b 100644
--- a/Tools/WebKitTestRunner/InjectedBundle/qt/TestRunnerQt.cpp
+++ b/Tools/WebKitTestRunner/InjectedBundle/qt/TestRunnerQt.cpp
@@ -29,10 +29,12 @@
 
 #include "ActivateFonts.h"
 #include "InjectedBundle.h"
+#include "QtTestSupport.h"
 #include <QCoreApplication>
 #include <QDir>
 #include <QFontDatabase>
 #include <QObject>
+#include <QtCore/qglobal.h>
 #include <qwebsettings.h>
 
 namespace WTR {
@@ -59,13 +61,9 @@ private:
 
 void TestRunner::platformInitialize()
 {
-    // Make WebKit2 mimic the behaviour of DumpRenderTree, which is incorrect,
-    // but tests are successfully passed. On the long run, Qt will move to QRawFont,
-    // which makes the use of QFontDatabase unnecessary.
-    // See https://bugs.webkit.org/show_bug.cgi?id=53427
-    QWebSettings::clearMemoryCaches();
-    QFontDatabase::removeAllApplicationFonts();
+    WebKit::QtTestSupport::clearMemoryCaches();
     activateFonts();
+
     QObject::connect(&m_waitToDumpWatchdogTimer, SIGNAL(timeout()), WatchdogTimerHelper::instance(), SLOT(timerFired()));
 }