Index: base/trace_event/trace_event.h |
diff --git a/base/trace_event/trace_event.h b/base/trace_event/trace_event.h |
index 397bafc3550faf11c3bae4a1b5b4576bb81c9efb..6bd9c1bf57ffbe89773c936c41b4e09bba5211b0 100644 |
--- a/base/trace_event/trace_event.h |
+++ b/base/trace_event/trace_event.h |
@@ -852,6 +852,9 @@ |
#define TRACE_EVENT_FLOW_END0(category_group, name, id) \ |
INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_END, \ |
category_group, name, id, TRACE_EVENT_FLAG_NONE) |
+#define TRACE_EVENT_FLOW_END_BIND_TO_ENCLOSING0(category_group, name, id) \ |
+ INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_END, \ |
+ category_group, name, id, TRACE_EVENT_FLAG_BIND_TO_ENCLOSING) |
#define TRACE_EVENT_FLOW_END1(category_group, name, id, arg1_name, arg1_val) \ |
INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_FLOW_END, \ |
category_group, name, id, TRACE_EVENT_FLAG_NONE, arg1_name, arg1_val) |
@@ -1137,6 +1140,7 @@ TRACE_EVENT_API_CLASS_EXPORT extern \ |
#define TRACE_EVENT_FLAG_SCOPE_OFFSET (static_cast<unsigned char>(1 << 3)) |
#define TRACE_EVENT_FLAG_SCOPE_EXTRA (static_cast<unsigned char>(1 << 4)) |
#define TRACE_EVENT_FLAG_EXPLICIT_TIMESTAMP (static_cast<unsigned char>(1 << 5)) |
+#define TRACE_EVENT_FLAG_BIND_TO_ENCLOSING (static_cast<unsigned char>(1 << 6)) |
#define TRACE_EVENT_FLAG_ASYNC_TTS (static_cast<unsigned char>(1 << 6)) |
dsinclair
2015/06/11 15:21:54
This is going to conflict. We have the same value
|
#define TRACE_EVENT_FLAG_SCOPE_MASK (static_cast<unsigned char>( \ |