Title: [121550] trunk/Tools
- Revision
- 121550
- Author
- [email protected]
- Date
- 2012-06-29 05:05:29 -0700 (Fri, 29 Jun 2012)
Log Message
[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:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (121549 => 121550)
--- trunk/Tools/ChangeLog 2012-06-29 11:22:37 UTC (rev 121549)
+++ trunk/Tools/ChangeLog 2012-06-29 12:05:29 UTC (rev 121550)
@@ -1,3 +1,20 @@
+2012-06-29 Balazs Kelemen <[email protected]>
+
+ [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ø <[email protected]>
Revert r121540, it broke most Qt builds
Modified: trunk/Tools/Tools.pro (121549 => 121550)
--- trunk/Tools/Tools.pro 2012-06-29 11:22:37 UTC (rev 121549)
+++ trunk/Tools/Tools.pro 2012-06-29 12:05:29 UTC (rev 121550)
@@ -17,8 +17,7 @@
!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.
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (121549 => 121550)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2012-06-29 11:22:37 UTC (rev 121549)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2012-06-29 12:05:29 UTC (rev 121550)
@@ -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 @@
{
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 @@
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)
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp (121549 => 121550)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp 2012-06-29 11:22:37 UTC (rev 121549)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp 2012-06-29 12:05:29 UTC (rev 121550)
@@ -29,7 +29,6 @@
#include "config.h"
#include "ActivateFonts.h"
-#include "DumpRenderTreeSupportQt.h"
#include "QtInitializeTestFonts.h"
#include <QApplication>
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
