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

Side by Side Diff: Source/core/inspector/InspectorTraceEvents.cpp

Issue 724013003: DevTools: Connect worker cpu profiles to worker tracing threads. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Addressing comments. Created 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/inspector/InspectorTraceEvents.h" 6 #include "core/inspector/InspectorTraceEvents.h"
7 7
8 #include "bindings/core/v8/ScriptCallStackFactory.h" 8 #include "bindings/core/v8/ScriptCallStackFactory.h"
9 #include "bindings/core/v8/ScriptGCEvent.h" 9 #include "bindings/core/v8/ScriptGCEvent.h"
10 #include "bindings/core/v8/ScriptSourceCode.h" 10 #include "bindings/core/v8/ScriptSourceCode.h"
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 604
605 PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorTimeStampEvent::data(E xecutionContext* context, const String& message) 605 PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorTimeStampEvent::data(E xecutionContext* context, const String& message)
606 { 606 {
607 RefPtr<TracedValue> value = TracedValue::create(); 607 RefPtr<TracedValue> value = TracedValue::create();
608 value->setString("message", message); 608 value->setString("message", message);
609 if (LocalFrame* frame = frameForExecutionContext(context)) 609 if (LocalFrame* frame = frameForExecutionContext(context))
610 value->setString("frame", toHexString(frame)); 610 value->setString("frame", toHexString(frame));
611 return value.release(); 611 return value.release();
612 } 612 }
613 613
614 PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorTracingSessionIdForWor kerEvent::data(const String& sessionId, WorkerThread* workerThread) 614 PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorTracingSessionIdForWor kerEvent::data(const String& sessionId, int workerId, WorkerThread* workerThread )
615 { 615 {
616 RefPtr<TracedValue> value = TracedValue::create(); 616 RefPtr<TracedValue> value = TracedValue::create();
617 value->setString("sessionId", sessionId); 617 value->setString("sessionId", sessionId);
618 value->setInteger("workerId", workerId);
618 value->setDouble("workerThreadId", workerThread->platformThreadId()); 619 value->setDouble("workerThreadId", workerThread->platformThreadId());
619 return value.release(); 620 return value.release();
620 } 621 }
621 622
622 } 623 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698