Merge 32397 - Only clears the unblock flag on sync IPCs during other sync dis...

chrome/plugin/plugin_channel_base.h

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_PLUGIN_PLUGIN_CHANNEL_BASE_H_
 #define CHROME_PLUGIN_PLUGIN_CHANNEL_BASE_H_
 
 #include <string>
 
 #include "app/gfx/native_widget_types.h"
@@ skipping 67 matching lines @@
 
   // Implemented by derived classes to handle control messages
   virtual void OnControlMessageReceived(const IPC::Message& msg);
 
   // IPC::Channel::Listener implementation:
   virtual void OnMessageReceived(const IPC::Message& msg);
   virtual void OnChannelConnected(int32 peer_pid);
   virtual void OnChannelError();
 
   // If this is set, sync messages that are sent will only unblock the receiver
-  // if this channel is in the middle of a dispatch.
-  void SendUnblockingOnlyDuringDispatch();
+  // if this channel is in the middle of a sync dispatch.
+  void SendUnblockingOnlyDuringSyncDispatch();
 
   virtual bool Init(MessageLoop* ipc_message_loop, bool create_pipe_now);
 
   scoped_ptr<IPC::SyncChannel> channel_;
 
  private:
   IPC::Channel::Mode mode_;
   std::string channel_name_;
   int plugin_count_;
   int peer_pid_;
 
   // true when in the middle of a RemoveRoute call
   bool in_remove_route_;
 
   // Keep track of all the registered NPObjects proxies/stubs so that when the
   // channel is closed we can inform them.
   typedef base::hash_map<int, IPC::Channel::Listener*> ListenerMap;
   ListenerMap npobject_listeners_;
 
   // Used to implement message routing functionality to WebPlugin[Delegate]
   // objects
   MessageRouter router_;
 
   // A channel is invalid if it is disconnected as a result of a channel
   // error. This flag is used to indicate the same.
   bool channel_valid_;
 
-  // Track whether we're within a dispatch; works like a refcount, 0 when we're
-  // not.
-  int in_dispatch_;
+  // Track whether we're within a synchronous dispatch; works like a refcount,
+  // 0 when we're not.
+  int in_sync_dispatch_;
 
   // If true, sync messages will only be marked as unblocking if the channel is
-  // in the middle of dispatching a message.
-  bool send_unblocking_only_during_dispatch_;
+  // in the middle of dispatching a synchronous message.
+  bool send_unblocking_only_during_sync_dispatch_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginChannelBase);
 };
 
 #endif  // CHROME_PLUGIN_PLUGIN_CHANNEL_BASE_H_