Title: [147563] trunk/Tools
- Revision
- 147563
- Author
- zeno.albis...@digia.com
- Date
- 2013-04-03 09:27:46 -0700 (Wed, 03 Apr 2013)
Log Message
[Qt] Add getter for JSC TestRunner to DumpRenderTreeQt.
https://bugs.webkit.org/show_bug.cgi?id=113864
Moving setDefersLoading from TestRunnerQt to TestRunner
requires access to the non-Qt TestRunner.
As long as we instantiate both TestRunner and TestRunnerQt,
we need a separate getter for the non-Qt TestRunner instance.
Reviewed by Simon Hausmann.
* DumpRenderTree/qt/DumpRenderTreeQt.cpp:
(WebPage::resetSettings):
* DumpRenderTree/qt/DumpRenderTreeQt.h:
(DumpRenderTree::jscTestRunner):
* DumpRenderTree/qt/TestRunnerQt.cpp:
(TestRunner::setDefersLoading):
Moving setDefersLoading from TestRunnerQt
to TestRunner.
* DumpRenderTree/qt/TestRunnerQt.h:
(TestRunnerQt):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (147562 => 147563)
--- trunk/Tools/ChangeLog 2013-04-03 16:12:21 UTC (rev 147562)
+++ trunk/Tools/ChangeLog 2013-04-03 16:27:46 UTC (rev 147563)
@@ -1,3 +1,26 @@
+2013-04-03 Zeno Albisser <z...@webkit.org>
+
+ [Qt] Add getter for JSC TestRunner to DumpRenderTreeQt.
+ https://bugs.webkit.org/show_bug.cgi?id=113864
+
+ Moving setDefersLoading from TestRunnerQt to TestRunner
+ requires access to the non-Qt TestRunner.
+ As long as we instantiate both TestRunner and TestRunnerQt,
+ we need a separate getter for the non-Qt TestRunner instance.
+
+ Reviewed by Simon Hausmann.
+
+ * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+ (WebPage::resetSettings):
+ * DumpRenderTree/qt/DumpRenderTreeQt.h:
+ (DumpRenderTree::jscTestRunner):
+ * DumpRenderTree/qt/TestRunnerQt.cpp:
+ (TestRunner::setDefersLoading):
+ Moving setDefersLoading from TestRunnerQt
+ to TestRunner.
+ * DumpRenderTree/qt/TestRunnerQt.h:
+ (TestRunnerQt):
+
2013-04-03 Manuel Rego Casasnovas <r...@igalia.com>
[GTK][WK2] Unskip /webkit2/WebKitWebContext/uri-scheme
Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp (147562 => 147563)
--- trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp 2013-04-03 16:12:21 UTC (rev 147562)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp 2013-04-03 16:27:46 UTC (rev 147563)
@@ -194,7 +194,7 @@
m_drt->testRunner()->setCaretBrowsingEnabled(false);
m_drt->testRunner()->setAuthorAndUserStylesEnabled(true);
- m_drt->testRunner()->setDefersLoading(false);
+ m_drt->jscTestRunner()->setDefersLoading(false);
// globalSettings must be reset explicitly.
m_drt->testRunner()->setXSSAuditorEnabled(false);
Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.h (147562 => 147563)
--- trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.h 2013-04-03 16:12:21 UTC (rev 147562)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.h 2013-04-03 16:27:46 UTC (rev 147563)
@@ -89,6 +89,7 @@
void resetToConsistentStateBeforeTesting(const QUrl&);
TestRunnerQt *testRunner() const { return m_controller; }
+ TestRunner *jscTestRunner() const { return m_jscController.get(); }
EventSender *eventSender() const { return m_eventSender; }
TextInputController *textInputController() const { return m_textInputController; }
QString persistentStoragePath() const { return m_persistentStoragePath; }
Modified: trunk/Tools/DumpRenderTree/qt/TestRunnerQt.cpp (147562 => 147563)
--- trunk/Tools/DumpRenderTree/qt/TestRunnerQt.cpp 2013-04-03 16:12:21 UTC (rev 147562)
+++ trunk/Tools/DumpRenderTree/qt/TestRunnerQt.cpp 2013-04-03 16:27:46 UTC (rev 147563)
@@ -421,11 +421,6 @@
DumpRenderTreeSupportQt::webInspectorExecuteScript(m_drt->pageAdapter(), callId, script);
}
-void TestRunnerQt::setDefersLoading(bool flag)
-{
- DumpRenderTreeSupportQt::setDefersLoading(m_drt->pageAdapter(), flag);
-}
-
void TestRunnerQt::setAllowUniversalAccessFromFileURLs(bool enabled)
{
m_drt->webPage()->settings()->setAttribute(QWebSettings::LocalContentCanAccessRemoteUrls, enabled);
@@ -1109,8 +1104,9 @@
{
}
-void TestRunner::setDefersLoading(bool)
+void TestRunner::setDefersLoading(bool flag)
{
+ DumpRenderTreeSupportQt::setDefersLoading(DumpRenderTree::instance()->pageAdapter(), flag);
}
void TestRunner::setCacheModel(int)
Modified: trunk/Tools/DumpRenderTree/qt/TestRunnerQt.h (147562 => 147563)
--- trunk/Tools/DumpRenderTree/qt/TestRunnerQt.h 2013-04-03 16:12:21 UTC (rev 147562)
+++ trunk/Tools/DumpRenderTree/qt/TestRunnerQt.h 2013-04-03 16:27:46 UTC (rev 147563)
@@ -187,7 +187,6 @@
*/
void setScrollbarPolicy(const QString& orientation, const QString& policy);
- void setDefersLoading(bool);
void setAlwaysAcceptCookies(bool);
void setAlwaysBlockCookies(bool);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
