diff options
| author | erikchen <erikchen@chromium.org> | 2015-12-03 22:52:25 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-04 06:53:04 +0000 |
| commit | 939fec8f54ea3d7df1e8c6898ac47bb1bfadece9 (patch) | |
| tree | 400dfe6346b8aee6e364de2fca95106ba6a6ebd6 | |
| parent | 05926d6f4e749cd49a16fa04a35e3498eb1b01a0 (diff) | |
| download | chromium_src-939fec8f54ea3d7df1e8c6898ac47bb1bfadece9.zip chromium_src-939fec8f54ea3d7df1e8c6898ac47bb1bfadece9.tar.gz chromium_src-939fec8f54ea3d7df1e8c6898ac47bb1bfadece9.tar.bz2 | |
ipc: USE_ATTACHMENT_BROKER should apply to both Windows and OSX.
Previously, many uses of the preprocessor conditional were restricted to OSX,
since the Windows version of IPC::Message::Header did not have the
num_brokered_attachments field.
BUG=493414
Review URL: https://codereview.chromium.org/1494623003
Cr-Commit-Position: refs/heads/master@{#363155}
| -rw-r--r-- | ipc/ipc_channel_reader_unittest.cc | 2 | ||||
| -rw-r--r-- | ipc/ipc_message.cc | 4 | ||||
| -rw-r--r-- | ipc/ipc_message_unittest.cc | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ipc/ipc_channel_reader_unittest.cc b/ipc/ipc_channel_reader_unittest.cc index ee29072..b83f08cd 100644 --- a/ipc/ipc_channel_reader_unittest.cc +++ b/ipc/ipc_channel_reader_unittest.cc @@ -16,7 +16,7 @@ // Whether IPC::Message::FindNext() can determine message size for // partial messages. The condition is from FindNext() implementation. -#if USE_ATTACHMENT_BROKER && defined(OS_MACOSX) && !defined(OS_IOS) +#if USE_ATTACHMENT_BROKER #define MESSAGE_FINDNEXT_PARTIAL 0 #else #define MESSAGE_FINDNEXT_PARTIAL 1 diff --git a/ipc/ipc_message.cc b/ipc/ipc_message.cc index fcdd9c3..d51cb65 100644 --- a/ipc/ipc_message.cc +++ b/ipc/ipc_message.cc @@ -180,7 +180,7 @@ void Message::FindNext(const char* range_start, bool have_entire_pickle = static_cast<size_t>(range_end - range_start) >= pickle_size; -#if USE_ATTACHMENT_BROKER && defined(OS_MACOSX) && !defined(OS_IOS) +#if USE_ATTACHMENT_BROKER // TODO(dskiba): determine message_size when entire pickle is not available if (!have_entire_pickle) @@ -252,7 +252,7 @@ bool Message::WriteAttachment(scoped_refptr<MessageAttachment> attachment) { // keep the current descriptor as extra decoding state when deserialising. WriteInt(static_cast<int>(index)); -#if USE_ATTACHMENT_BROKER && defined(OS_MACOSX) && !defined(OS_IOS) +#if USE_ATTACHMENT_BROKER if (brokerable) header()->num_brokered_attachments++; #endif diff --git a/ipc/ipc_message_unittest.cc b/ipc/ipc_message_unittest.cc index bb133e5..1bd4df3 100644 --- a/ipc/ipc_message_unittest.cc +++ b/ipc/ipc_message_unittest.cc @@ -149,7 +149,7 @@ TEST(IPCMessageTest, FindNext) { // (but contains the message header) IPC::Message::FindNext(data_start, data_end - 1, &next); EXPECT_FALSE(next.message_found); -#if USE_ATTACHMENT_BROKER && defined(OS_MACOSX) && !defined(OS_IOS) +#if USE_ATTACHMENT_BROKER EXPECT_EQ(next.message_size, 0u); #else EXPECT_EQ(next.message_size, message.size()); @@ -185,7 +185,7 @@ TEST(IPCMessageTest, FindNextOverflow) { message.header()->payload_size = static_cast<uint32_t>(-1); IPC::Message::FindNext(data_start, data_end, &next); EXPECT_FALSE(next.message_found); -#if USE_ATTACHMENT_BROKER && defined(OS_MACOSX) && !defined(OS_IOS) +#if USE_ATTACHMENT_BROKER EXPECT_EQ(next.message_size, 0u); #else if (sizeof(size_t) > sizeof(uint32_t)) { @@ -203,7 +203,7 @@ TEST(IPCMessageTest, FindNextOverflow) { message.header()->payload_size = std::numeric_limits<int32_t>::max(); IPC::Message::FindNext(data_start, data_end, &next); EXPECT_FALSE(next.message_found); -#if USE_ATTACHMENT_BROKER && defined(OS_MACOSX) && !defined(OS_IOS) +#if USE_ATTACHMENT_BROKER EXPECT_EQ(next.message_size, 0u); #else EXPECT_EQ(next.message_size, |