Changeset 147563 in webkit
- Timestamp:
- Apr 3, 2013 9:27:46 AM (11 years ago)
- Location:
- trunk/Tools
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r147559 r147563 1 2013-04-03 Zeno Albisser <zeno@webkit.org> 2 3 [Qt] Add getter for JSC TestRunner to DumpRenderTreeQt. 4 https://bugs.webkit.org/show_bug.cgi?id=113864 5 6 Moving setDefersLoading from TestRunnerQt to TestRunner 7 requires access to the non-Qt TestRunner. 8 As long as we instantiate both TestRunner and TestRunnerQt, 9 we need a separate getter for the non-Qt TestRunner instance. 10 11 Reviewed by Simon Hausmann. 12 13 * DumpRenderTree/qt/DumpRenderTreeQt.cpp: 14 (WebPage::resetSettings): 15 * DumpRenderTree/qt/DumpRenderTreeQt.h: 16 (DumpRenderTree::jscTestRunner): 17 * DumpRenderTree/qt/TestRunnerQt.cpp: 18 (TestRunner::setDefersLoading): 19 Moving setDefersLoading from TestRunnerQt 20 to TestRunner. 21 * DumpRenderTree/qt/TestRunnerQt.h: 22 (TestRunnerQt): 23 1 24 2013-04-03 Manuel Rego Casasnovas <rego@igalia.com> 2 25 -
trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
r145890 r147563 195 195 m_drt->testRunner()->setCaretBrowsingEnabled(false); 196 196 m_drt->testRunner()->setAuthorAndUserStylesEnabled(true); 197 m_drt-> testRunner()->setDefersLoading(false);197 m_drt->jscTestRunner()->setDefersLoading(false); 198 198 199 199 // globalSettings must be reset explicitly. -
trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.h
r145719 r147563 90 90 91 91 TestRunnerQt *testRunner() const { return m_controller; } 92 TestRunner *jscTestRunner() const { return m_jscController.get(); } 92 93 EventSender *eventSender() const { return m_eventSender; } 93 94 TextInputController *textInputController() const { return m_textInputController; } -
trunk/Tools/DumpRenderTree/qt/TestRunnerQt.cpp
r147543 r147563 420 420 { 421 421 DumpRenderTreeSupportQt::webInspectorExecuteScript(m_drt->pageAdapter(), callId, script); 422 }423 424 void TestRunnerQt::setDefersLoading(bool flag)425 {426 DumpRenderTreeSupportQt::setDefersLoading(m_drt->pageAdapter(), flag);427 422 } 428 423 … … 1110 1105 } 1111 1106 1112 void TestRunner::setDefersLoading(bool) 1113 { 1107 void TestRunner::setDefersLoading(bool flag) 1108 { 1109 DumpRenderTreeSupportQt::setDefersLoading(DumpRenderTree::instance()->pageAdapter(), flag); 1114 1110 } 1115 1111 -
trunk/Tools/DumpRenderTree/qt/TestRunnerQt.h
r147543 r147563 188 188 void setScrollbarPolicy(const QString& orientation, const QString& policy); 189 189 190 void setDefersLoading(bool);191 190 void setAlwaysAcceptCookies(bool); 192 191 void setAlwaysBlockCookies(bool);
Note: See TracChangeset
for help on using the changeset viewer.