diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-12 21:51:04 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-12 21:51:04 +0000 |
| commit | 141a87c51d6a835669853d3b43c51c2f326a18e0 (patch) | |
| tree | 7ad589aaef8159109e475e125b8f66d6f7cc5c75 | |
| parent | feff4bb55d5714fd58fd65309b952cf72b9a0c91 (diff) | |
| download | chromium_src-141a87c51d6a835669853d3b43c51c2f326a18e0.zip chromium_src-141a87c51d6a835669853d3b43c51c2f326a18e0.tar.gz chromium_src-141a87c51d6a835669853d3b43c51c2f326a18e0.tar.bz2 | |
Disable nested message loops in Mac for now. There seems to be a problem with the message pumping or IPC channel where the sent reply from the browser doesn't make it to the renderer main thread.
BUG=24337
Review URL: http://codereview.chromium.org/273023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28745 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/browser_uitest.cc | 4 | ||||
| -rw-r--r-- | chrome/renderer/render_view.cc | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/browser_uitest.cc b/chrome/browser/browser_uitest.cc index ca70a44..235fa98 100644 --- a/chrome/browser/browser_uitest.cc +++ b/chrome/browser/browser_uitest.cc @@ -237,6 +237,8 @@ TEST_F(VisibleBrowserTest, WindowOpenClose) { } #endif +#if !defined(OS_MACOSX) // see http://crbug.com/24337 + class ShowModalDialogTest : public UITest { public: ShowModalDialogTest() { @@ -267,6 +269,8 @@ TEST_F(ShowModalDialogTest, BasicTest) { ASSERT_EQ(L"SUCCESS", title); } +#endif + class SecurityTest : public UITest { protected: static const int kTestIntervalMs = 250; diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 09fbe86..b0c7591 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -3636,7 +3636,10 @@ bool RenderView::SendAndRunNestedMessageLoop(IPC::SyncMessage* message) { PluginChannelHost::Broadcast( new PluginMsg_SignalModalDialogEvent(host_window_)); +#if !defined(OS_MACOSX) // see http://crbug.com/24337 message->EnableMessagePumping(); // Runs a nested message loop. +#endif + bool rv = Send(message); PluginChannelHost::Broadcast( |