Title: [140703] trunk/Tools
- Revision
- 140703
- Author
- [email protected]
- Date
- 2013-01-24 12:10:38 -0800 (Thu, 24 Jan 2013)
Log 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (140702 => 140703)
--- trunk/Tools/ChangeLog 2013-01-24 19:35:17 UTC (rev 140702)
+++ trunk/Tools/ChangeLog 2013-01-24 20:10:38 UTC (rev 140703)
@@ -1,3 +1,20 @@
+2013-01-24 Erik Arvidsson <[email protected]>
+
+ 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 <[email protected]>
Adding "has-landed" command to webkit-patch which compares a
Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.cpp (140702 => 140703)
--- trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2013-01-24 19:35:17 UTC (rev 140702)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2013-01-24 20:10:38 UTC (rev 140703)
@@ -202,8 +202,6 @@
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 @@
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.
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp (140702 => 140703)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2013-01-24 19:35:17 UTC (rev 140702)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2013-01-24 20:10:38 UTC (rev 140703)
@@ -1081,22 +1081,12 @@
: 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 @@
m_layerTreeView.clear();
webWidget()->close();
- m_webWidget = 0;
- m_shutdownWasInvoked = true;
+ if (m_inModalLoop)
+ webkit_support::QuitMessageLoop();
}
void WebViewHost::setWebWidget(WebKit::WebWidget* widget)
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.h (140702 => 140703)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2013-01-24 19:35:17 UTC (rev 140702)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2013-01-24 20:10:38 UTC (rev 140703)
@@ -79,7 +79,6 @@
public:
WebViewHost(TestShell*);
virtual ~WebViewHost();
- void shutdown();
void setWebWidget(WebKit::WebWidget*);
WebKit::WebView* webView() const;
WebKit::WebWidget* webWidget() const;
@@ -372,9 +371,6 @@
bool m_hasWindow;
bool m_inModalLoop;
-
- bool m_shutdownWasInvoked;
-
WebKit::WebRect m_windowRect;
// true if we want to enable smart insert/delete.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
