| Index: third_party/WebKit/Source/core/probe/CoreProbes.cpp
|
| diff --git a/third_party/WebKit/Source/core/probe/CoreProbes.cpp b/third_party/WebKit/Source/core/probe/CoreProbes.cpp
|
| index 40fcaf9810929ba6c938d1fdb361897778c40d47..0efc3e99dd31b14d423835ec706d040cd8241fd0 100644
|
| --- a/third_party/WebKit/Source/core/probe/CoreProbes.cpp
|
| +++ b/third_party/WebKit/Source/core/probe/CoreProbes.cpp
|
| @@ -120,7 +120,8 @@ void DidReceiveResourceResponseButCanceled(LocalFrame* frame,
|
| unsigned long identifier,
|
| const ResourceResponse& r,
|
| Resource* resource) {
|
| - didReceiveResourceResponse(frame, identifier, loader, r, resource);
|
| + didReceiveResourceResponse(frame->GetDocument(), identifier, loader, r,
|
| + resource);
|
| }
|
|
|
| void CanceledAfterReceivedResourceResponse(LocalFrame* frame,
|
| @@ -142,9 +143,14 @@ void ContinueWithPolicyIgnore(LocalFrame* frame,
|
| CoreProbeSink* ToCoreProbeSink(WorkerGlobalScope* worker_global_scope) {
|
| if (!worker_global_scope)
|
| return nullptr;
|
| + WorkerThread* thread = worker_global_scope->GetThread();
|
| + // |thread| is null after WorkerGlobalScope::dispose() is called.
|
| + if (!thread)
|
| + return nullptr;
|
| if (WorkerInspectorController* controller =
|
| - worker_global_scope->GetThread()->GetWorkerInspectorController())
|
| + worker_global_scope->GetThread()->GetWorkerInspectorController()) {
|
| return controller->InstrumentingAgents();
|
| + }
|
| return nullptr;
|
| }
|
|
|
|
|