Chromium Code Reviews| OLD | NEW |
|---|---|
| 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" |
| 11 #include "core/events/Event.h" | 11 #include "core/events/Event.h" |
| 12 #include "core/frame/FrameView.h" | 12 #include "core/frame/FrameView.h" |
| 13 #include "core/frame/LocalFrame.h" | 13 #include "core/frame/LocalFrame.h" |
| 14 #include "core/inspector/IdentifiersFactory.h" | 14 #include "core/inspector/IdentifiersFactory.h" |
| 15 #include "core/inspector/InspectorNodeIds.h" | 15 #include "core/inspector/InspectorNodeIds.h" |
| 16 #include "core/inspector/ScriptCallStack.h" | 16 #include "core/inspector/ScriptCallStack.h" |
| 17 #include "core/page/Page.h" | 17 #include "core/page/Page.h" |
| 18 #include "core/rendering/RenderImage.h" | 18 #include "core/rendering/RenderImage.h" |
| 19 #include "core/rendering/RenderObject.h" | 19 #include "core/rendering/RenderObject.h" |
| 20 #include "core/workers/WorkerThread.h" | |
| 20 #include "core/xml/XMLHttpRequest.h" | 21 #include "core/xml/XMLHttpRequest.h" |
| 21 #include "platform/JSONValues.h" | 22 #include "platform/JSONValues.h" |
| 22 #include "platform/TracedValue.h" | 23 #include "platform/TracedValue.h" |
| 23 #include "platform/graphics/GraphicsLayer.h" | 24 #include "platform/graphics/GraphicsLayer.h" |
| 24 #include "platform/network/ResourceRequest.h" | 25 #include "platform/network/ResourceRequest.h" |
| 25 #include "platform/network/ResourceResponse.h" | 26 #include "platform/network/ResourceResponse.h" |
| 26 #include "platform/weborigin/KURL.h" | 27 #include "platform/weborigin/KURL.h" |
| 27 #include "wtf/Vector.h" | 28 #include "wtf/Vector.h" |
| 28 #include <inttypes.h> | 29 #include <inttypes.h> |
| 29 | 30 |
| (...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 348 | 349 |
| 349 PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorTimeStampEvent::data(E xecutionContext* context, const String& message) | 350 PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorTimeStampEvent::data(E xecutionContext* context, const String& message) |
| 350 { | 351 { |
| 351 RefPtr<TracedValue> value = TracedValue::create(); | 352 RefPtr<TracedValue> value = TracedValue::create(); |
| 352 value->setString("message", message); | 353 value->setString("message", message); |
| 353 if (LocalFrame* frame = frameForExecutionContext(context)) | 354 if (LocalFrame* frame = frameForExecutionContext(context)) |
| 354 value->setString("frame", toHexString(frame)); | 355 value->setString("frame", toHexString(frame)); |
| 355 return value; | 356 return value; |
| 356 } | 357 } |
| 357 | 358 |
| 359 PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorTracingStartedInWorker Event::data(const String& sessionId, WorkerThread* workerThread) | |
| 360 { | |
| 361 RefPtr<TracedValue> value = TracedValue::create(); | |
| 362 value->setString("sessionId", sessionId); | |
| 363 value->setDouble("workerThreadId", workerThread->platformThreadId()); | |
|
loislo
2014/09/09 13:59:44
do we have a guaranty that workerThread object is
yurys
2014/09/09 14:04:27
We don't need the thread to be alive there as we r
loislo
2014/09/09 14:14:08
ok
| |
| 364 return value; | |
| 365 } | |
| 366 | |
| 358 } | 367 } |
| OLD | NEW |