diff options
| author | erikchen <erikchen@chromium.org> | 2015-12-03 12:37:17 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-03 20:39:02 +0000 |
| commit | 419c4771419b031cf24c4997c109b78c4c96760b (patch) | |
| tree | cba288729b17b2db201158676cdaafb4eba0f1be | |
| parent | 04e01ee14b56c54d2fa59ee0b5c35e727669461b (diff) | |
| download | chromium_src-419c4771419b031cf24c4997c109b78c4c96760b.zip chromium_src-419c4771419b031cf24c4997c109b78c4c96760b.tar.gz chromium_src-419c4771419b031cf24c4997c109b78c4c96760b.tar.bz2 | |
Add the field num_brokered_attachments to IPC::Message::Header on Windows.
This CL adds the field and initializes it to 0. It has no other effect. This is
probably going to cause some assertions to fail, due to interactions with
third-party software. See the associated bugs for more details.
BUG=527588, 493414
Review URL: https://codereview.chromium.org/1500453002
Cr-Commit-Position: refs/heads/master@{#363047}
| -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 d64c8028..fcdd9c3 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. |