Commit 864dfd0a authored by arv@chromium.org's avatar arv@chromium.org

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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@140703 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 07d7fc6a
2013-01-24 Erik Arvidsson <arv@chromium.org>
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):
2013-01-24 Tim 'mithro' Ansell <mithro@mithis.com>
Adding "has-landed" command to webkit-patch which compares a
......
......@@ -202,8 +202,6 @@ TestShell::~TestShell()
m_testRunner->setDelegate(0);
m_testRunner->setWebView(0);
m_drtDevToolsAgent->setWebView(0);
if (m_webViewHost)
m_webViewHost->shutdown();
}
void TestShell::createDRTDevToolsClient(DRTDevToolsAgent* agent)
......@@ -796,7 +794,6 @@ void TestShell::closeWindow(WebViewHost* window)
if (window->webWidget() == m_focusedWidget)
focusedWidget = 0;
window->shutdown();
delete window;
// We set the focused widget after deleting the web view host because it
// can change the focus.
......
......@@ -1081,22 +1081,12 @@ WebViewHost::WebViewHost(TestShell* shell)
: m_shell(shell)
, m_proxy(0)
, m_webWidget(0)
, m_shutdownWasInvoked(false)
{
reset();
}
WebViewHost::~WebViewHost()
{
ASSERT(m_shutdownWasInvoked);
if (m_inModalLoop)
webkit_support::QuitMessageLoop();
}
void WebViewHost::shutdown()
{
ASSERT(!m_shutdownWasInvoked);
// DevTools frontend page is supposed to be navigated only once and
// loading another URL in that Page is an error.
if (m_shell->devToolsWebView() != this) {
......@@ -1111,8 +1101,8 @@ void WebViewHost::shutdown()
m_layerTreeView.clear();
webWidget()->close();
m_webWidget = 0;
m_shutdownWasInvoked = true;
if (m_inModalLoop)
webkit_support::QuitMessageLoop();
}
void WebViewHost::setWebWidget(WebKit::WebWidget* widget)
......
......@@ -79,7 +79,6 @@ class WebViewHost : public WebKit::WebViewClient, public WebKit::WebFrameClient,
public:
WebViewHost(TestShell*);
virtual ~WebViewHost();
void shutdown();
void setWebWidget(WebKit::WebWidget*);
WebKit::WebView* webView() const;
WebKit::WebWidget* webWidget() const;
......@@ -372,9 +371,6 @@ private:
bool m_hasWindow;
bool m_inModalLoop;
bool m_shutdownWasInvoked;
WebKit::WebRect m_windowRect;
// true if we want to enable smart insert/delete.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment