diff options
| author | erikchen <erikchen@chromium.org> | 2015-10-20 10:22:59 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-20 17:24:02 +0000 |
| commit | e2eeedbfaefbdd4a7aa48733aff7ae15ce831fb6 (patch) | |
| tree | 9f9a45284998a6cce33b17f87c6dab7f79ecb48e /ipc | |
| parent | 71054cec2355ae92482b1644b0cf76b8b836f9c1 (diff) | |
| download | chromium_src-e2eeedbfaefbdd4a7aa48733aff7ae15ce831fb6.zip chromium_src-e2eeedbfaefbdd4a7aa48733aff7ae15ce831fb6.tar.gz chromium_src-e2eeedbfaefbdd4a7aa48733aff7ae15ce831fb6.tar.bz2 | |
Revert of ipc: Add a member to IPC::Message::Header on Windows. (patchset #1 id:1 of https://codereview.chromium.org/1400713002/ )
Reason for revert:
Likely causes crashes:
https://code.google.com/p/chromium/issues/detail?id=527588#c57
Original issue's description:
> 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
>
> Committed: https://crrev.com/c32bea67c022c6c385463f0eec027f18b2915300
> Cr-Commit-Position: refs/heads/master@{#354889}
TBR=tsepez@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=527588
Review URL: https://codereview.chromium.org/1414293002
Cr-Commit-Position: refs/heads/master@{#355089}
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/ipc_message.cc | 4 | ||||
| -rw-r--r-- | ipc/ipc_message.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/ipc/ipc_message.cc b/ipc/ipc_message.cc index 87c7633..1df631b 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 USE_ATTACHMENT_BROKER +#if defined(OS_MACOSX) 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 USE_ATTACHMENT_BROKER +#if defined(OS_MACOSX) header()->num_brokered_attachments = 0; #endif #if defined(OS_POSIX) diff --git a/ipc/ipc_message.h b/ipc/ipc_message.h index cace8d3..22d1c99 100644 --- a/ipc/ipc_message.h +++ b/ipc/ipc_message.h @@ -13,7 +13,6 @@ #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" @@ -269,7 +268,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 USE_ATTACHMENT_BROKER +#if defined(OS_MACOSX) // 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. |