Changeset 140717 in webkit


Ignore:
Timestamp:
Jan 24, 2013 1:37:51 PM (11 years ago)
Author:
arv@chromium.org
Message:

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

r140561 was not the reason for the Android breakage

  • DumpRenderTree/chromium/TestShell.cpp:

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

  • DumpRenderTree/chromium/WebViewHost.cpp:

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

  • DumpRenderTree/chromium/WebViewHost.h:

(WebViewHost):

Location:
trunk/Tools
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r140713 r140717  
     12013-01-24  Erik Arvidsson  <arv@chromium.org>
     2
     3        Unreviewed, rolling out r140703.
     4        http://trac.webkit.org/changeset/140703
     5        https://bugs.webkit.org/show_bug.cgi?id=107556
     6
     7        r140561 was not the reason for the Android breakage
     8
     9        * DumpRenderTree/chromium/TestShell.cpp:
     10        (TestShell::~TestShell):
     11        (TestShell::closeWindow):
     12        * DumpRenderTree/chromium/WebViewHost.cpp:
     13        (WebViewHost::WebViewHost):
     14        (WebViewHost::~WebViewHost):
     15        (WebViewHost::shutdown):
     16        * DumpRenderTree/chromium/WebViewHost.h:
     17        (WebViewHost):
     18
    1192013-01-24  Dean Jackson  <dino@apple.com>
    220

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

    r140703 r140717  
    203203    m_testRunner->setWebView(0);
    204204    m_drtDevToolsAgent->setWebView(0);
     205    if (m_webViewHost)
     206        m_webViewHost->shutdown();
    205207}
    206208
    … …  
    795797        focusedWidget = 0;
    796798
     799    window->shutdown();
    797800    delete window;
    798801    // We set the focused widget after deleting the web view host because it

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

    r140703 r140717  
    10821082    , m_proxy(0)
    10831083    , m_webWidget(0)
     1084    , m_shutdownWasInvoked(false)
    10841085{
    10851086    reset();
    … …  
    10881089WebViewHost::~WebViewHost()
    10891090{
     1091    ASSERT(m_shutdownWasInvoked);
     1092    if (m_inModalLoop)
     1093        webkit_support::QuitMessageLoop();
     1094}
     1095
     1096void WebViewHost::shutdown()
     1097{
     1098    ASSERT(!m_shutdownWasInvoked);
     1099
    10901100    // DevTools frontend page is supposed to be navigated only once and
    10911101    // loading another URL in that Page is an error.
    … …  
    11021112    m_layerTreeView.clear();
    11031113    webWidget()->close();
    1104     if (m_inModalLoop)
    1105         webkit_support::QuitMessageLoop();
     1114    m_webWidget = 0;
     1115    m_shutdownWasInvoked = true;
    11061116}
    11071117

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

    r140703 r140717  
    8080    WebViewHost(TestShell*);
    8181    virtual ~WebViewHost();
     82    void shutdown();
    8283    void setWebWidget(WebKit::WebWidget*);
    8384    WebKit::WebView* webView() const;
    … …  
    372373    bool m_hasWindow;
    373374    bool m_inModalLoop;
     375
     376    bool m_shutdownWasInvoked;
     377
    374378    WebKit::WebRect m_windowRect;
    375379
Note: See TracChangeset for help on using the changeset viewer.