Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(409)

Unified Diff: ipc/ipc_message.cc

Issue 1392713004: ipc: Add missing includes for USE_ATTACHMENT_BROKER. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit test. Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/child_process_host_impl.cc ('k') | ipc/ipc_message_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/ipc_message.cc
diff --git a/ipc/ipc_message.cc b/ipc/ipc_message.cc
index 684c11bff5fe39c041ed03b1faf813c83fe6225b..4980b40efb4c25c656d5bc5e53f598806966979b 100644
--- a/ipc/ipc_message.cc
+++ b/ipc/ipc_message.cc
@@ -9,6 +9,7 @@
#include "base/atomic_sequence_num.h"
#include "base/logging.h"
#include "build/build_config.h"
+#include "ipc/attachment_broker.h"
#include "ipc/ipc_message_attachment.h"
#include "ipc/ipc_message_attachment_set.h"
#include "ipc/placeholder_brokerable_attachment.h"
@@ -178,7 +179,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
+#if USE_ATTACHMENT_BROKER && defined(OS_MACOSX) && !defined(OS_IOS)
// TODO(dskiba): determine message_size when entire pickle is not available
if (!have_entire_pickle)
@@ -204,7 +205,7 @@ void Message::FindNext(const char* range_start,
if (buffer_length < attachment_length + pickle_size)
return;
- for (int i = 0; i < num_attachments; ++i) {
+ for (size_t i = 0; i < num_attachments; ++i) {
const char* attachment_start =
pickle_end + i * BrokerableAttachment::kNonceSize;
BrokerableAttachment::AttachmentId id(attachment_start,
« no previous file with comments | « content/common/child_process_host_impl.cc ('k') | ipc/ipc_message_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698