[Qt][WTR] Get rid of using DumpRenderTreeSupportQt

https://bugs.webkit.org/show_bug.cgi?id=90262

Reviewed by Alexey Proskuryakov.

Now that we decided to not support v8 in WebKit2
we can get rid of using DumpRenderTreeSupportQt
in WebKitTestRunner.

* Tools.pro:
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::resetAfterTest):
(WTR::InjectedBundlePage::didClearWindowForFrame):
* WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121550 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index ffdcda5..a375e34 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,20 @@
+2012-06-29  Balazs Kelemen  <kbalazs@webkit.org>
+
+        [Qt][WTR] Get rid of using DumpRenderTreeSupportQt
+        https://bugs.webkit.org/show_bug.cgi?id=90262
+
+        Reviewed by Alexey Proskuryakov.
+
+        Now that we decided to not support v8 in WebKit2
+        we can get rid of using DumpRenderTreeSupportQt
+        in WebKitTestRunner.
+
+        * Tools.pro:
+        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+        (WTR::InjectedBundlePage::resetAfterTest):
+        (WTR::InjectedBundlePage::didClearWindowForFrame):
+        * WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp:
+
 2012-06-29  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 
         Revert r121540, it broke most Qt builds

diff --git a/Tools/Tools.pro b/Tools/Tools.pro
index 63c993b..64e837b 100644 (file)
--- a/Tools/Tools.pro
+++ b/Tools/Tools.pro
@@ -17,8 +17,7 @@ load(features)
 
 !no_webkit2 {
     SUBDIRS += MiniBrowser/qt/MiniBrowser.pro
-    # WTR's InjectedBundle depends currently on WK1's DumpRenderTreeSupport
-    !no_webkit1: SUBDIRS += WebKitTestRunner/WebKitTestRunner.pro
+    SUBDIRS += WebKitTestRunner/WebKitTestRunner.pro
 }
 
 # FIXME: with Qt 5 the test plugin cause some trouble during layout tests.

diff --git a/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp b/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
index dc2ad3d..86c8697 100644 (file)
--- a/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
+++ b/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
@@ -45,10 +45,6 @@
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
 
-#if PLATFORM(QT)
-#include "DumpRenderTreeSupportQt.h"
-#endif
-
 using namespace std;
 
 namespace WTR {
@@ -351,11 +347,7 @@ void InjectedBundlePage::resetAfterTest()
 {
     WKBundleFrameRef frame = WKBundlePageGetMainFrame(m_page);
     JSGlobalContextRef context = WKBundleFrameGetJavaScriptContext(frame);
-#if PLATFORM(QT)
-    DumpRenderTreeSupportQt::injectInternalsObject(context);
-#else
     WebCoreTestSupport::resetInternalsObject(context);
-#endif
 }
 
 // Loader Client Callbacks
@@ -777,11 +769,7 @@ void InjectedBundlePage::didClearWindowForFrame(WKBundleFrameRef frame, WKBundle
     InjectedBundle::shared().textInputController()->makeWindowObject(context, window, &exception);
     InjectedBundle::shared().accessibilityController()->makeWindowObject(context, window, &exception);
 
-#if PLATFORM(QT)
-    DumpRenderTreeSupportQt::injectInternalsObject(context);
-#else
     WebCoreTestSupport::injectInternalsObject(context);
-#endif
 }
 
 void InjectedBundlePage::didCancelClientRedirectForFrame(WKBundleFrameRef frame)

diff --git a/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp b/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp
index d51f102..60d2727 100644 (file)
--- a/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp
+++ b/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp
@@ -29,7 +29,6 @@
 
 #include "config.h"
 #include "ActivateFonts.h"
-#include "DumpRenderTreeSupportQt.h"
 #include "QtInitializeTestFonts.h"
 
 #include <QApplication>