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

Unified Diff: ipc/ipc_message.cc

Issue 57783006: Revert https://src.chromium.org/viewvc/chrome?view=rev&revision=231330 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile (cc perftest). Created 7 years, 1 month 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 | « ipc/ipc_message.h ('k') | ipc/ipc_message_macros.h » ('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 b1eaaae11c0de5f15568510db1ba9c243554f419..cf3a65e077f08dc767f63150d48c848b79589419 100644
--- a/ipc/ipc_message.cc
+++ b/ipc/ipc_message.cc
@@ -50,11 +50,12 @@ Message::Message()
InitLoggingVariables();
}
-Message::Message(int32 routing_id, uint32 type)
+Message::Message(int32 routing_id, uint32 type, PriorityValue priority)
: Pickle(sizeof(Header)) {
header()->routing = routing_id;
header()->type = type;
- header()->flags = GetRefNumUpper24();
+ DCHECK((priority & 0xffffff00) == 0);
+ header()->flags = priority | GetRefNumUpper24();
#if defined(OS_POSIX)
header()->num_fds = 0;
header()->pad = 0;
@@ -62,8 +63,7 @@ Message::Message(int32 routing_id, uint32 type)
InitLoggingVariables();
}
-Message::Message(const char* data, size_t data_len)
- : Pickle(data, data_len) {
+Message::Message(const char* data, int data_len) : Pickle(data, data_len) {
InitLoggingVariables();
}
« no previous file with comments | « ipc/ipc_message.h ('k') | ipc/ipc_message_macros.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698