Index: third_party/WebKit/Source/core/inspector/InspectorTraceEvents.cpp |
diff --git a/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.cpp b/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.cpp |
index 6526b15ef9aecf3153b28fe7353b74dfb1009ce4..9909536e483f3da6d20348cd29b8bfeed1aeda88 100644 |
--- a/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.cpp |
+++ b/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.cpp |
@@ -24,6 +24,7 @@ |
#include "core/layout/HitTestResult.h" |
#include "core/layout/LayoutImage.h" |
#include "core/layout/LayoutObject.h" |
+#include "core/loader/DocumentLoader.h" |
#include "core/loader/resource/CSSStyleSheetResource.h" |
#include "core/page/Page.h" |
#include "core/paint/PaintLayer.h" |
@@ -107,53 +108,57 @@ DEFINE_TRACE(InspectorTraceEvents) { |
} |
void InspectorTraceEvents::willSendRequest( |
- LocalFrame* frame, |
unsigned long identifier, |
- DocumentLoader*, |
+ DocumentLoader* loader, |
ResourceRequest& request, |
const ResourceResponse& redirectResponse, |
const FetchInitiatorInfo&) { |
+ LocalFrame* frame = loader ? loader->frame() : nullptr; |
TRACE_EVENT_INSTANT1( |
"devtools.timeline", "ResourceSendRequest", TRACE_EVENT_SCOPE_THREAD, |
"data", InspectorSendRequestEvent::data(identifier, frame, request)); |
- probe::asyncTaskScheduled(frame->document(), "SendRequest", |
+ probe::asyncTaskScheduled(frame ? frame->document() : nullptr, "SendRequest", |
asyncId(identifier)); |
} |
void InspectorTraceEvents::didReceiveResourceResponse( |
- LocalFrame* frame, |
unsigned long identifier, |
- DocumentLoader*, |
+ DocumentLoader* loader, |
const ResourceResponse& response, |
Resource*) { |
+ LocalFrame* frame = loader ? loader->frame() : nullptr; |
TRACE_EVENT_INSTANT1( |
"devtools.timeline", "ResourceReceiveResponse", TRACE_EVENT_SCOPE_THREAD, |
"data", InspectorReceiveResponseEvent::data(identifier, frame, response)); |
- probe::AsyncTask asyncTask(frame->document(), asyncId(identifier), |
- "response"); |
+ probe::AsyncTask asyncTask(frame ? frame->document() : nullptr, |
+ asyncId(identifier), "response"); |
} |
-void InspectorTraceEvents::didReceiveData(LocalFrame* frame, |
- unsigned long identifier, |
+void InspectorTraceEvents::didReceiveData(unsigned long identifier, |
+ DocumentLoader* loader, |
const char* data, |
int encodedDataLength) { |
+ LocalFrame* frame = loader ? loader->frame() : nullptr; |
TRACE_EVENT_INSTANT1( |
"devtools.timeline", "ResourceReceivedData", TRACE_EVENT_SCOPE_THREAD, |
"data", |
InspectorReceiveDataEvent::data(identifier, frame, encodedDataLength)); |
- probe::AsyncTask asyncTask(frame->document(), asyncId(identifier), "data"); |
+ probe::AsyncTask asyncTask(frame ? frame->document() : nullptr, |
+ asyncId(identifier), "data"); |
} |
-void InspectorTraceEvents::didFinishLoading(LocalFrame* frame, |
- unsigned long identifier, |
+void InspectorTraceEvents::didFinishLoading(unsigned long identifier, |
+ DocumentLoader* loader, |
double finishTime, |
int64_t encodedDataLength, |
int64_t decodedBodyLength) { |
+ LocalFrame* frame = loader ? loader->frame() : nullptr; |
TRACE_EVENT_INSTANT1( |
"devtools.timeline", "ResourceFinish", TRACE_EVENT_SCOPE_THREAD, "data", |
InspectorResourceFinishEvent::data(identifier, finishTime, false, |
encodedDataLength, decodedBodyLength)); |
- probe::AsyncTask asyncTask(frame->document(), asyncId(identifier)); |
+ probe::AsyncTask asyncTask(frame ? frame->document() : nullptr, |
+ asyncId(identifier)); |
} |
void InspectorTraceEvents::didFailLoading(unsigned long identifier, |