Changeset 107704 in webkit
- Timestamp:
- Feb 14, 2012 4:36:08 AM (12 years ago)
- Location:
- trunk/Tools
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r107697 r107704 1 2012-02-14 Jochen Eisinger <jochen@chromium.org> 2 3 [chromium] check that we're not running multiple modal dialogs at the same time 4 https://bugs.webkit.org/show_bug.cgi?id=78486 5 6 Reviewed by Kent Tamura. 7 8 * DumpRenderTree/chromium/TestShell.cpp: 9 (TestShell::TestShell): 10 * DumpRenderTree/chromium/TestShell.h: 11 (TestShell::setIsDisplayingModalDialog): 12 (TestShell::isDisplayingModalDialog): 13 (TestShell): 14 * DumpRenderTree/chromium/WebViewHost.cpp: 15 (WebViewHost::runModal): 16 1 17 2012-02-14 Adam Barth <abarth@webkit.org> 2 18 -
trunk/Tools/DumpRenderTree/chromium/TestShell.cpp
r107329 r107704 117 117 , m_stressDeopt(false) 118 118 , m_dumpWhenFinished(true) 119 , m_isDisplayingModalDialog(false) 119 120 { 120 121 WebRuntimeFeatures::enableDataTransferItems(true); -
trunk/Tools/DumpRenderTree/chromium/TestShell.h
r107022 r107704 164 164 void setDumpWhenFinished(bool dumpWhenFinished) { m_dumpWhenFinished = dumpWhenFinished; } 165 165 166 void setIsDisplayingModalDialog(bool isDisplayingModalDialog) { m_isDisplayingModalDialog = isDisplayingModalDialog; } 167 bool isDisplayingModalDialog() const { return m_isDisplayingModalDialog; } 168 166 169 WebViewHost* createNewWindow(const WebKit::WebURL&); 167 170 void closeWindow(WebViewHost*); … … 235 238 std::string m_javaScriptFlags; 236 239 bool m_dumpWhenFinished; 240 bool m_isDisplayingModalDialog; 237 241 238 242 -
trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp
r107176 r107704 894 894 void WebViewHost::runModal() 895 895 { 896 if (m_shell->isDisplayingModalDialog()) { 897 // DumpRenderTree doesn't support modal dialogs, so a test shouldn't try to start two modal dialogs at the same time. 898 ASSERT_NOT_REACHED(); 899 return; 900 } 901 m_shell->setIsDisplayingModalDialog(true); 896 902 bool oldState = webkit_support::MessageLoopNestableTasksAllowed(); 897 903 webkit_support::MessageLoopSetNestableTasksAllowed(true); … … 899 905 webkit_support::RunMessageLoop(); 900 906 webkit_support::MessageLoopSetNestableTasksAllowed(oldState); 907 m_shell->setIsDisplayingModalDialog(false); 901 908 } 902 909
Note: See TracChangeset
for help on using the changeset viewer.