diff options
| author | erikchen <erikchen@chromium.org> | 2015-10-19 15:23:32 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-19 22:24:29 +0000 |
| commit | c32bea67c022c6c385463f0eec027f18b2915300 (patch) | |
| tree | 36c56c83bdeaf66d2cef823dd1dda323bd0cf4ce /ipc | |
| parent | 0a055d4ed3129fa30ab01aee36b315831f41fcdf (diff) | |
| download | chromium_src-c32bea67c022c6c385463f0eec027f18b2915300.zip chromium_src-c32bea67c022c6c385463f0eec027f18b2915300.tar.gz chromium_src-c32bea67c022c6c385463f0eec027f18b2915300.tar.bz2 | |
ipc: Add a member to IPC::Message::Header on Windows.
According to my most recent debugging experiments, the root cause of the crashes
that happened the first time I tried to make this change have magically
disappeared. See the bug for more details.
BUG=527588
Review URL: https://codereview.chromium.org/1400713002
Cr-Commit-Position: refs/heads/master@{#354889}
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/ipc_message.cc | 4 | ||||
| -rw-r--r-- | ipc/ipc_message.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ipc/ipc_message.cc b/ipc/ipc_message.cc index 1df631b..87c7633 100644 --- a/ipc/ipc_message.cc +++ b/ipc/ipc_message.cc @@ -50,7 +50,7 @@ Message::~Message() { Message::Message() : base::Pickle(sizeof(Header)) { header()->routing = header()->type = 0; header()->flags = GetRefNumUpper24(); -#if defined(OS_MACOSX) +#if USE_ATTACHMENT_BROKER header()->num_brokered_attachments = 0; #endif #if defined(OS_POSIX) @@ -66,7 +66,7 @@ Message::Message(int32_t routing_id, uint32_t type, PriorityValue priority) header()->type = type; DCHECK((priority & 0xffffff00) == 0); header()->flags = priority | GetRefNumUpper24(); -#if defined(OS_MACOSX) +#if USE_ATTACHMENT_BROKER header()->num_brokered_attachments = 0; #endif #if defined(OS_POSIX) diff --git a/ipc/ipc_message.h b/ipc/ipc_message.h index 22d1c99..cace8d3 100644 --- a/ipc/ipc_message.h +++ b/ipc/ipc_message.h @@ -13,6 +13,7 @@ #include "base/memory/ref_counted.h" #include "base/pickle.h" #include "base/trace_event/trace_event.h" +#include "ipc/attachment_broker.h" #include "ipc/brokerable_attachment.h" #include "ipc/ipc_export.h" @@ -268,7 +269,7 @@ class IPC_EXPORT Message : public base::Pickle { int32_t routing; // ID of the view that this message is destined for uint32_t type; // specifies the user-defined message type uint32_t flags; // specifies control flags for the message -#if defined(OS_MACOSX) +#if USE_ATTACHMENT_BROKER // The number of brokered attachments included with this message. The // ids of the brokered attachment ids are sent immediately after the pickled // message, before the next pickled message is sent. |