commit 390c7814321cb6708a6979daecd0c727c38b7695
author jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed May 12 20:32:52 2010
committer jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed May 12 20:32:52 2010
tree 62fc029b7aeea74a8b8bd93e998bed9b841c79cd
parent a669333ec5caf533bc52c8aa68d6110630835b54

Fix possible deadlock in PluginChannel.

This occurs when the renderer sends an async message with the unblock flag, and then a sync message right after.  If the plugin process just made a sync (with no unblock) call to the renderer, it'll dispatch the first message, and if that leads to a sync call to the renderer, then the unblock flag won't get sent and a deadlock occurs.

BUG=43617
Review URL: http://codereview.chromium.org/2045012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47063 0039d316-1c4b-4281-b951-d872f2087c98

chrome/plugin/plugin_channel.cc

diff --git a/chrome/plugin/plugin_channel.cc b/chrome/plugin/plugin_channel.cc
index 3e5b3af..33faff9a 100644
--- a/chrome/plugin/plugin_channel.cc
+++ b/chrome/plugin/plugin_channel.cc
@@ -167,7 +167,7 @@
       in_send_(0),
       off_the_record_(false),
       filter_(new MessageFilter()) {
-  SendUnblockingOnlyDuringSyncDispatch();
+  set_send_unblocking_only_during_unblock_dispatch();
   ChildProcess::current()->AddRefProcess();
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   log_messages_ = command_line->HasSwitch(switches::kLogPluginMessages);