Changeset 140703 in webkit


Ignore:
Timestamp:
Jan 24, 2013 12:10:38 PM (11 years ago)
Author:
arv@chromium.org
Message:

Unreviewed, rolling out r140561.
​http://trac.webkit.org/changeset/140561
​https://bugs.webkit.org/show_bug.cgi?id=107556

Suspected to break Android which prevens WebKit roll

  • DumpRenderTree/chromium/TestShell.cpp:

(TestShell::~TestShell):
(TestShell::closeWindow):

  • DumpRenderTree/chromium/WebViewHost.cpp:

(WebViewHost::WebViewHost):
(WebViewHost::~WebViewHost):

  • DumpRenderTree/chromium/WebViewHost.h:

(WebViewHost):

Location:
trunk/Tools
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r140674 r140703  
     12013-01-24  Erik Arvidsson  <arv@chromium.org>
     2
     3        Unreviewed, rolling out r140561.
     4        http://trac.webkit.org/changeset/140561
     5        https://bugs.webkit.org/show_bug.cgi?id=107556
     6
     7        Suspected to break Android which prevens WebKit roll
     8
     9        * DumpRenderTree/chromium/TestShell.cpp:
     10        (TestShell::~TestShell):
     11        (TestShell::closeWindow):
     12        * DumpRenderTree/chromium/WebViewHost.cpp:
     13        (WebViewHost::WebViewHost):
     14        (WebViewHost::~WebViewHost):
     15        * DumpRenderTree/chromium/WebViewHost.h:
     16        (WebViewHost):
     17
    1182013-01-24  Tim 'mithro' Ansell  <mithro@mithis.com>
    219

  • trunk/Tools/DumpRenderTree/chromium/TestShell.cpp

    r140668 r140703  
    203203    m_testRunner->setWebView(0);
    204204    m_drtDevToolsAgent->setWebView(0);
    205     if (m_webViewHost)
    206         m_webViewHost->shutdown();
    207205}
    208206
    … …  
    797795        focusedWidget = 0;
    798796
    799     window->shutdown();
    800797    delete window;
    801798    // We set the focused widget after deleting the web view host because it

  • trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp

    r140668 r140703  
    10821082    , m_proxy(0)
    10831083    , m_webWidget(0)
    1084     , m_shutdownWasInvoked(false)
    10851084{
    10861085    reset();
    … …  
    10891088WebViewHost::~WebViewHost()
    10901089{
    1091     ASSERT(m_shutdownWasInvoked);
    1092     if (m_inModalLoop)
    1093         webkit_support::QuitMessageLoop();
    1094 }
    1095 
    1096 void WebViewHost::shutdown()
    1097 {
    1098     ASSERT(!m_shutdownWasInvoked);
    1099 
    11001090    // DevTools frontend page is supposed to be navigated only once and
    11011091    // loading another URL in that Page is an error.
    … …  
    11121102    m_layerTreeView.clear();
    11131103    webWidget()->close();
    1114     m_webWidget = 0;
    1115     m_shutdownWasInvoked = true;
     1104    if (m_inModalLoop)
     1105        webkit_support::QuitMessageLoop();
    11161106}
    11171107

  • trunk/Tools/DumpRenderTree/chromium/WebViewHost.h

    r140668 r140703  
    8080    WebViewHost(TestShell*);
    8181    virtual ~WebViewHost();
    82     void shutdown();
    8382    void setWebWidget(WebKit::WebWidget*);
    8483    WebKit::WebView* webView() const;
    … …  
    373372    bool m_hasWindow;
    374373    bool m_inModalLoop;
    375 
    376     bool m_shutdownWasInvoked;
    377 
    378374    WebKit::WebRect m_windowRect;
    379375
Note: See TracChangeset for help on using the changeset viewer.