diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-04 22:28:12 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-04 22:28:12 +0000 |
| commit | 753bb25fc70b560fb3539e2b63843a193ccb295a (patch) | |
| tree | d42966216756764b92d90162e993ab766c307dc7 /ipc/ipc_message.cc | |
| parent | 715e27238d32ba17d2c06acf37bca40bb0a180cb (diff) | |
| download | chromium_src-753bb25fc70b560fb3539e2b63843a193ccb295a.zip chromium_src-753bb25fc70b560fb3539e2b63843a193ccb295a.tar.gz chromium_src-753bb25fc70b560fb3539e2b63843a193ccb295a.tar.bz2 | |
Revert https://src.chromium.org/viewvc/chrome?view=rev&revision=231330
This is a speculative revert to see if it's the cause of hanging renderers.
BUG=313112
Review URL: https://codereview.chromium.org/57783006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232819 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_message.cc')
| -rw-r--r-- | ipc/ipc_message.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ipc/ipc_message.cc b/ipc/ipc_message.cc index b1eaaae..cf3a65e 100644 --- a/ipc/ipc_message.cc +++ b/ipc/ipc_message.cc @@ -50,11 +50,12 @@ Message::Message() InitLoggingVariables(); } -Message::Message(int32 routing_id, uint32 type) +Message::Message(int32 routing_id, uint32 type, PriorityValue priority) : Pickle(sizeof(Header)) { header()->routing = routing_id; header()->type = type; - header()->flags = GetRefNumUpper24(); + DCHECK((priority & 0xffffff00) == 0); + header()->flags = priority | GetRefNumUpper24(); #if defined(OS_POSIX) header()->num_fds = 0; header()->pad = 0; @@ -62,8 +63,7 @@ Message::Message(int32 routing_id, uint32 type) InitLoggingVariables(); } -Message::Message(const char* data, size_t data_len) - : Pickle(data, data_len) { +Message::Message(const char* data, int data_len) : Pickle(data, data_len) { InitLoggingVariables(); } |