Title: [121788] trunk/Tools
- Revision
- 121788
- Author
- [email protected]
- Date
- 2012-07-03 10:36:27 -0700 (Tue, 03 Jul 2012)
Log Message
[Qt][WTR] Get rid of using DumpRenderTreeSupportQt
https://bugs.webkit.org/show_bug.cgi?id=90262
Unreviewed build fix.
Reverting r121550 manually because it caused build
break on ARM and Mac. It turned out that the Qt build
system is too broken for this change now, first we have
to address two issues:
* symbol hiding was forbidden accidentally on x86 Linux
* Qt lacks a separate library for test support
* Tools.pro:
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::resetAfterTest):
(WTR::InjectedBundlePage::didClearWindowForFrame):
* WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (121787 => 121788)
--- trunk/Tools/ChangeLog 2012-07-03 17:30:44 UTC (rev 121787)
+++ trunk/Tools/ChangeLog 2012-07-03 17:36:27 UTC (rev 121788)
@@ -1,3 +1,23 @@
+2012-07-03 Balazs Kelemen <[email protected]>
+
+ [Qt][WTR] Get rid of using DumpRenderTreeSupportQt
+ https://bugs.webkit.org/show_bug.cgi?id=90262
+
+ Unreviewed build fix.
+
+ Reverting r121550 manually because it caused build
+ break on ARM and Mac. It turned out that the Qt build
+ system is too broken for this change now, first we have
+ to address two issues:
+ * symbol hiding was forbidden accidentally on x86 Linux
+ * Qt lacks a separate library for test support
+
+ * Tools.pro:
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+ (WTR::InjectedBundlePage::resetAfterTest):
+ (WTR::InjectedBundlePage::didClearWindowForFrame):
+ * WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp:
+
2012-07-03 Tony Chang <[email protected]>
[chromium] Handle trailing backslash on %VSINSTALLDIR%
Modified: trunk/Tools/Tools.pro (121787 => 121788)
--- trunk/Tools/Tools.pro 2012-07-03 17:30:44 UTC (rev 121787)
+++ trunk/Tools/Tools.pro 2012-07-03 17:36:27 UTC (rev 121788)
@@ -17,6 +17,9 @@
SUBDIRS += MiniBrowser/qt/MiniBrowser.pro
SUBDIRS += WebKitTestRunner/WebKitTestRunner.pro
SUBDIRS += MiniBrowser/qt/raw/MiniBrowserRaw.pro
+
+ # WTR's InjectedBundle depends currently on WK1's DumpRenderTreeSupport
+ !no_webkit1: SUBDIRS += WebKitTestRunner/WebKitTestRunner.pro
}
# FIXME: with Qt 5 the test plugin cause some trouble during layout tests.
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (121787 => 121788)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2012-07-03 17:30:44 UTC (rev 121787)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2012-07-03 17:36:27 UTC (rev 121788)
@@ -45,6 +45,10 @@
#include <wtf/text/CString.h>
#include <wtf/text/StringBuilder.h>
+#if PLATFORM(QT)
+#include "DumpRenderTreeSupportQt.h"
+#endif
+
using namespace std;
namespace WTR {
@@ -347,7 +351,11 @@
{
WKBundleFrameRef frame = WKBundlePageGetMainFrame(m_page);
JSGlobalContextRef context = WKBundleFrameGetJavaScriptContext(frame);
+#if PLATFORM(QT)
+ DumpRenderTreeSupportQt::injectInternalsObject(context);
+#else
WebCoreTestSupport::resetInternalsObject(context);
+#endif
}
// Loader Client Callbacks
@@ -769,7 +777,11 @@
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 (121787 => 121788)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp 2012-07-03 17:30:44 UTC (rev 121787)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp 2012-07-03 17:36:27 UTC (rev 121788)
@@ -29,6 +29,7 @@
#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
