Chromium Code Reviews| Index: Source/core/inspector/InspectorTraceEvents.cpp |
| diff --git a/Source/core/inspector/InspectorTraceEvents.cpp b/Source/core/inspector/InspectorTraceEvents.cpp |
| index 261f48465cc5982b5320b3c2ca0a34e5ea27fba2..555e0b7359835dd7fc1886cd459e555ad24a8482 100644 |
| --- a/Source/core/inspector/InspectorTraceEvents.cpp |
| +++ b/Source/core/inspector/InspectorTraceEvents.cpp |
| @@ -426,11 +426,14 @@ PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorTimerFireEvent::data(E |
| return genericTimerData(context, timerId); |
| } |
| -PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorAnimationFrameEvent::data(Document* document, int callbackId) |
| +PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorAnimationFrameEvent::data(ExecutionContext* context, int callbackId) |
| { |
| RefPtr<TracedValue> value = TracedValue::create(); |
| value->setInteger("id", callbackId); |
| - value->setString("frame", toHexString(document->frame())); |
| + if (context->isDocument()) |
| + value->setString("frame", toHexString(toDocument(context)->frame())); |
| + else if (context->isWorkerGlobalScope()) |
| + value->setString("worker", toHexString(toWorkerGlobalScope(context))); |
|
esprehn
2015/04/01 05:03:25
This seems unrelated to the rename, it's good to d
sadrul
2015/04/01 06:38:52
Acknowledged. Sorry. I will pay more attention to
|
| setCallStack(value.get()); |
| return value.release(); |
| } |