| Index: ipc/ipc_message.h
|
| diff --git a/ipc/ipc_message.h b/ipc/ipc_message.h
|
| index 56c3a46b5e95e215240e605f05891888d00ca0e6..b8689639f262fb4a9fa38803a87511f3cf7a69c5 100644
|
| --- a/ipc/ipc_message.h
|
| +++ b/ipc/ipc_message.h
|
| @@ -15,7 +15,6 @@
|
| #include "base/pickle.h"
|
| #include "base/trace_event/trace_event.h"
|
| #include "build/build_config.h"
|
| -#include "ipc/attachment_broker.h"
|
| #include "ipc/brokerable_attachment.h"
|
| #include "ipc/ipc_export.h"
|
|
|
| @@ -191,34 +190,13 @@ class IPC_EXPORT Message : public base::Pickle {
|
| // The end address of the message should be used to determine the start
|
| // address of the next message.
|
| const char* message_end;
|
| - // If the message has brokerable attachments, this vector will contain the
|
| - // ids of the brokerable attachments. The caller of FindNext() is
|
| - // responsible for adding the attachments to the message.
|
| - std::vector<BrokerableAttachment::AttachmentId> attachment_ids;
|
| };
|
|
|
| - struct SerializedAttachmentIds {
|
| - void* buffer;
|
| - size_t size;
|
| - };
|
| - // Creates a buffer that contains a serialization of the ids of the brokerable
|
| - // attachments of the message. This buffer is intended to be sent over the IPC
|
| - // channel immediately after the pickled message. The caller takes ownership
|
| - // of the buffer.
|
| - // This method should only be called if the message has brokerable
|
| - // attachments.
|
| - SerializedAttachmentIds SerializedIdsOfBrokerableAttachments();
|
| -
|
| // |info| is an output parameter and must not be nullptr.
|
| static void FindNext(const char* range_start,
|
| const char* range_end,
|
| NextMessageInfo* info);
|
|
|
| - // Adds a placeholder brokerable attachment that must be replaced before the
|
| - // message can be dispatched.
|
| - bool AddPlaceholderBrokerableAttachmentWithId(
|
| - BrokerableAttachment::AttachmentId id);
|
| -
|
| // WriteAttachment appends |attachment| to the end of the set. It returns
|
| // false iff the set is full.
|
| bool WriteAttachment(
|
| @@ -273,12 +251,6 @@ 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
|
| - // 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.
|
| - uint32_t num_brokered_attachments;
|
| -#endif
|
| #if defined(OS_POSIX)
|
| uint16_t num_fds; // the number of descriptors included with this message
|
| uint16_t pad; // explicitly initialize this to appease valgrind
|
|
|