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

Unified Diff: content/child/blink_platform_impl.cc

Issue 1239593002: Implement a new flow event API that allows binding flow events and regular events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add a flag for FLOW_OPTIONAL. Created 5 years, 5 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
Index: content/child/blink_platform_impl.cc
diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc
index d743fffac4636fee02a2845e2dc1a113205cf13d..184c4d78d57e33b887fea9863ffbd18c375756ef 100644
--- a/content/child/blink_platform_impl.cc
+++ b/content/child/blink_platform_impl.cc
@@ -635,9 +635,19 @@ blink::Platform::TraceEventHandle BlinkPlatformImpl::addTraceEvent(
base::TraceTicks() + base::TimeDelta::FromSecondsD(timestamp);
base::trace_event::TraceEventHandle handle =
TRACE_EVENT_API_ADD_TRACE_EVENT_WITH_THREAD_ID_AND_TIMESTAMP(
- phase, category_group_enabled, name, id, trace_event_internal::kNoId,
- base::PlatformThread::CurrentId(), timestamp_tt, num_args, arg_names,
- arg_types, arg_values, NULL, flags);
+ phase,
+ category_group_enabled,
+ name,
+ id,
+ trace_event_internal::kNoId,
+ base::PlatformThread::CurrentId(),
beaudoin 2015/07/27 18:34:14 EOL comments?
+ timestamp_tt,
+ num_args,
+ arg_names,
+ arg_types,
+ arg_values,
+ NULL,
+ flags);
blink::Platform::TraceEventHandle result;
memcpy(&result, &handle, sizeof(result));
return result;
@@ -671,9 +681,19 @@ blink::Platform::TraceEventHandle BlinkPlatformImpl::addTraceEvent(
base::TraceTicks() + base::TimeDelta::FromSecondsD(timestamp);
base::trace_event::TraceEventHandle handle =
TRACE_EVENT_API_ADD_TRACE_EVENT_WITH_THREAD_ID_AND_TIMESTAMP(
- phase, category_group_enabled, name, id, trace_event_internal::kNoId,
- base::PlatformThread::CurrentId(), timestamp_tt, num_args, arg_names,
- arg_types, arg_values, convertable_wrappers, flags);
+ phase,
+ category_group_enabled,
+ name,
+ id,
+ trace_event_internal::kNoId,
+ base::PlatformThread::CurrentId(),
beaudoin 2015/07/27 18:34:14 EOL comments?
+ timestamp_tt,
+ num_args,
+ arg_names,
+ arg_types,
+ arg_values,
+ convertable_wrappers,
+ flags);
blink::Platform::TraceEventHandle result;
memcpy(&result, &handle, sizeof(result));
return result;

Powered by Google App Engine
This is Rietveld 408576698