Title: [107858] trunk/Tools
- Revision
- 107858
- Author
- [email protected]
- Date
- 2012-02-15 17:06:44 -0800 (Wed, 15 Feb 2012)
Log Message
Unreviewed, rolling out r107704.
http://trac.webkit.org/changeset/107704
https://bugs.webkit.org/show_bug.cgi?id=78486
Caused layout test crashes in debug builds.
Specific crashing tests:
fast/events/show-modal-dialog-onblur-onfocus.html
fast/harness/show-modal-dialog.html
inspector/console/console-long-eval-crash.html
* DumpRenderTree/chromium/TestShell.cpp:
(TestShell::TestShell):
* DumpRenderTree/chromium/TestShell.h:
(TestShell):
* DumpRenderTree/chromium/WebViewHost.cpp:
(WebViewHost::runModal):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (107857 => 107858)
--- trunk/Tools/ChangeLog 2012-02-16 00:47:23 UTC (rev 107857)
+++ trunk/Tools/ChangeLog 2012-02-16 01:06:44 UTC (rev 107858)
@@ -1,3 +1,24 @@
+2012-02-15 Adam Klein <[email protected]>
+
+ Unreviewed, rolling out r107704.
+ http://trac.webkit.org/changeset/107704
+ https://bugs.webkit.org/show_bug.cgi?id=78486
+
+ Caused layout test crashes in debug builds.
+
+ Specific crashing tests:
+
+ fast/events/show-modal-dialog-onblur-onfocus.html
+ fast/harness/show-modal-dialog.html
+ inspector/console/console-long-eval-crash.html
+
+ * DumpRenderTree/chromium/TestShell.cpp:
+ (TestShell::TestShell):
+ * DumpRenderTree/chromium/TestShell.h:
+ (TestShell):
+ * DumpRenderTree/chromium/WebViewHost.cpp:
+ (WebViewHost::runModal):
+
2012-02-15 Michael Brüning <[email protected]>
[Qt] Add UI for HTTP authentication in the Qt MiniBrowser
Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.cpp (107857 => 107858)
--- trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2012-02-16 00:47:23 UTC (rev 107857)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2012-02-16 01:06:44 UTC (rev 107858)
@@ -116,7 +116,6 @@
, m_stressOpt(false)
, m_stressDeopt(false)
, m_dumpWhenFinished(true)
- , m_isDisplayingModalDialog(false)
{
WebRuntimeFeatures::enableDataTransferItems(true);
WebRuntimeFeatures::enableGeolocation(true);
Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.h (107857 => 107858)
--- trunk/Tools/DumpRenderTree/chromium/TestShell.h 2012-02-16 00:47:23 UTC (rev 107857)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.h 2012-02-16 01:06:44 UTC (rev 107858)
@@ -163,9 +163,6 @@
// testing where we only want to have the output from the last load.
void setDumpWhenFinished(bool dumpWhenFinished) { m_dumpWhenFinished = dumpWhenFinished; }
- void setIsDisplayingModalDialog(bool isDisplayingModalDialog) { m_isDisplayingModalDialog = isDisplayingModalDialog; }
- bool isDisplayingModalDialog() const { return m_isDisplayingModalDialog; }
-
WebViewHost* createNewWindow(const WebKit::WebURL&);
void closeWindow(WebViewHost*);
void closeRemainingWindows();
@@ -237,7 +234,6 @@
bool m_stressDeopt;
std::string m_javaScriptFlags;
bool m_dumpWhenFinished;
- bool m_isDisplayingModalDialog;
// List of all windows in this process.
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp (107857 => 107858)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2012-02-16 00:47:23 UTC (rev 107857)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2012-02-16 01:06:44 UTC (rev 107858)
@@ -893,18 +893,11 @@
void WebViewHost::runModal()
{
- if (m_shell->isDisplayingModalDialog()) {
- // DumpRenderTree doesn't support modal dialogs, so a test shouldn't try to start two modal dialogs at the same time.
- ASSERT_NOT_REACHED();
- return;
- }
- m_shell->setIsDisplayingModalDialog(true);
bool oldState = webkit_support::MessageLoopNestableTasksAllowed();
webkit_support::MessageLoopSetNestableTasksAllowed(true);
m_inModalLoop = true;
webkit_support::RunMessageLoop();
webkit_support::MessageLoopSetNestableTasksAllowed(oldState);
- m_shell->setIsDisplayingModalDialog(false);
}
bool WebViewHost::enterFullScreen()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
