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

Unified Diff: third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp

Issue 2755483007: DevTools: wire network requests to async infrastructure to test coverage. (Closed)
Patch Set: win compile Created 3 years, 9 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 | « no previous file | third_party/WebKit/Source/core/inspector/InspectorTraceEvents.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp b/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp
index a16579ec05cf0abcb08ebc34bd17cf40f51bfa84..607b3a797e02849a5ed1e81d63a407cc4820cd55 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp
@@ -79,10 +79,12 @@ AsyncTask::AsyncTask(ExecutionContext* context,
m_task(task),
m_recurring(step) {
if (m_recurring) {
- TRACE_EVENT_FLOW_STEP0("devtools.timeline.async", "AsyncTask", task,
+ TRACE_EVENT_FLOW_STEP0("devtools.timeline.async", "AsyncTask",
+ TRACE_ID_LOCAL(reinterpret_cast<uintptr_t>(task)),
step ? step : "");
} else {
- TRACE_EVENT_FLOW_END0("devtools.timeline.async", "AsyncTask", task);
+ TRACE_EVENT_FLOW_END0("devtools.timeline.async", "AsyncTask",
+ TRACE_ID_LOCAL(reinterpret_cast<uintptr_t>(task)));
}
if (m_debugger)
m_debugger->asyncTaskStarted(m_task);
@@ -99,8 +101,9 @@ AsyncTask::~AsyncTask() {
void asyncTaskScheduled(ExecutionContext* context,
const String& name,
void* task) {
- TRACE_EVENT_FLOW_BEGIN1("devtools.timeline.async", "AsyncTask", task, "data",
- InspectorAsyncTask::data(name));
+ TRACE_EVENT_FLOW_BEGIN1("devtools.timeline.async", "AsyncTask",
+ TRACE_ID_LOCAL(reinterpret_cast<uintptr_t>(task)),
+ "data", InspectorAsyncTask::data(name));
if (ThreadDebugger* debugger = ThreadDebugger::from(toIsolate(context)))
debugger->asyncTaskScheduled(name, task, true);
}
@@ -115,7 +118,8 @@ void asyncTaskScheduledBreakable(ExecutionContext* context,
void asyncTaskCanceled(ExecutionContext* context, void* task) {
if (ThreadDebugger* debugger = ThreadDebugger::from(toIsolate(context)))
debugger->asyncTaskCanceled(task);
- TRACE_EVENT_FLOW_END0("devtools.timeline.async", "AsyncTask", task);
+ TRACE_EVENT_FLOW_END0("devtools.timeline.async", "AsyncTask",
+ TRACE_ID_LOCAL(reinterpret_cast<uintptr_t>(task)));
}
void asyncTaskCanceledBreakable(ExecutionContext* context,
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/inspector/InspectorTraceEvents.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698