Backed out changeset 7d8ed1ceafd7 (bug 1287392)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Fri, 11 Nov 2016 17:03:02 +0100
changeset 352213 d243b2d5c128035af74a15d5ee1069066b7df89f
parent 352212 3530eb420c7f2ec8510304e7e30aee8fe07c23e7
child 352214 915541925ea9af60c3a8ad9c2e12197663e18055
push id6795
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 14:19:46 +0000
treeherdermozilla-esr52@76101b503191 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1287392
milestone52.0a1
backs out7d8ed1ceafd7cddb5ba8ef3de7582fc9a0df9600
Backed out changeset 7d8ed1ceafd7 (bug 1287392)
ipc/chromium/src/chrome/common/ipc_channel_posix.cc
--- a/ipc/chromium/src/chrome/common/ipc_channel_posix.cc
+++ b/ipc/chromium/src/chrome/common/ipc_channel_posix.cc
@@ -796,16 +796,22 @@ void Channel::ChannelImpl::CloseDescript
     }
   }
   DCHECK(false) << "pending_fd_id not in our list!";
 }
 #endif
 
 void Channel::ChannelImpl::OutputQueuePush(Message* msg)
 {
+#ifdef MOZ_TASK_TRACER
+  // Save the current TaskTracer info into the message header.
+  GetCurTraceInfo(&msg->header()->source_event_id,
+                  &msg->header()->parent_task_id,
+                  &msg->header()->source_event_type);
+#endif
   output_queue_.push(msg);
   output_queue_length_++;
 }
 
 void Channel::ChannelImpl::OutputQueuePop()
 {
   output_queue_.pop();
   output_queue_length_--;