diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-30 21:29:30 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-30 21:29:30 +0000 |
| commit | 298ee7d563620ce6253e393ec92b60c33a9042d3 (patch) | |
| tree | e37dafab37a47a7af1410006cc030c330bdb3ce3 /ipc/ipc_sync_message_unittest.h | |
| parent | 7e58cb27d8563d4c04016ce1e6fb46744acb9330 (diff) | |
| download | chromium_src-298ee7d563620ce6253e393ec92b60c33a9042d3.zip chromium_src-298ee7d563620ce6253e393ec92b60c33a9042d3.tar.gz chromium_src-298ee7d563620ce6253e393ec92b60c33a9042d3.tar.bz2 | |
IPC: change sync channel dispatch restriction to allow dispatch to other channels within the same "group"
This prevents 4-way deadlocks with 2 renderers talking to 2 different pepper plugins.
BUG=120530
TEST=RestrictedDispatch4WayDeadlock, load chromeos chrome with 2 gmail tabs (on 2 domains), quit and restore session multiple times.
Review URL: https://chromiumcodereview.appspot.com/9917002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129944 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_sync_message_unittest.h')
| -rw-r--r-- | ipc/ipc_sync_message_unittest.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ipc/ipc_sync_message_unittest.h b/ipc/ipc_sync_message_unittest.h index c77d0f8..66a7876 100644 --- a/ipc/ipc_sync_message_unittest.h +++ b/ipc/ipc_sync_message_unittest.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -111,4 +111,5 @@ IPC_SYNC_MESSAGE_ROUTED3_4(Msg_R_3_4, bool, int, std::string, int, bool, std::string, bool) IPC_MESSAGE_CONTROL1(SyncChannelTestMsg_Ping, int) +IPC_SYNC_MESSAGE_CONTROL1_1(SyncChannelTestMsg_PingTTL, int, int) IPC_SYNC_MESSAGE_CONTROL0_0(SyncChannelTestMsg_Done) |