Changeset 147563 in webkit


Ignore:
Timestamp:
Apr 3, 2013 9:27:46 AM (11 years ago)
Author:
zeno.albisser@digia.com
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):

Location:
trunk/Tools
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r147559 r147563  
     12013-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
    1242013-04-03  Manuel Rego Casasnovas  <rego@igalia.com>
    225
  • trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

    r145890 r147563  
    195195    m_drt->testRunner()->setCaretBrowsingEnabled(false);
    196196    m_drt->testRunner()->setAuthorAndUserStylesEnabled(true);
    197     m_drt->testRunner()->setDefersLoading(false);
     197    m_drt->jscTestRunner()->setDefersLoading(false);
    198198
    199199    // globalSettings must be reset explicitly.
  • trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.h

    r145719 r147563  
    9090
    9191    TestRunnerQt *testRunner() const { return m_controller; }
     92    TestRunner *jscTestRunner() const { return m_jscController.get(); }
    9293    EventSender *eventSender() const { return m_eventSender; }
    9394    TextInputController *textInputController() const { return m_textInputController; }
  • trunk/Tools/DumpRenderTree/qt/TestRunnerQt.cpp

    r147543 r147563  
    420420{
    421421    DumpRenderTreeSupportQt::webInspectorExecuteScript(m_drt->pageAdapter(), callId, script);
    422 }
    423 
    424 void TestRunnerQt::setDefersLoading(bool flag)
    425 {
    426     DumpRenderTreeSupportQt::setDefersLoading(m_drt->pageAdapter(), flag);
    427422}
    428423
     
    11101105}
    11111106
    1112 void TestRunner::setDefersLoading(bool)
    1113 {
     1107void TestRunner::setDefersLoading(bool flag)
     1108{
     1109    DumpRenderTreeSupportQt::setDefersLoading(DumpRenderTree::instance()->pageAdapter(), flag);
    11141110}
    11151111
  • trunk/Tools/DumpRenderTree/qt/TestRunnerQt.h

    r147543 r147563  
    188188    void setScrollbarPolicy(const QString& orientation, const QString& policy);
    189189
    190     void setDefersLoading(bool);
    191190    void setAlwaysAcceptCookies(bool);
    192191    void setAlwaysBlockCookies(bool);
Note: See TracChangeset for help on using the changeset viewer.