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

Unified Diff: third_party/WebKit/Source/core/probe/CoreProbes.cpp

Issue 2701753003: [WIP] off-main-thread loading
Patch Set: small fix Created 3 years, 8 months 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 side-by-side diff with in-line comments
Download patch
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 a9d792b7a80c6915af6259fe66ae77a58aa4afb2..e31f98282885db87486a73672d46b4f80c767509 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->document(), identifier, loader, r,
+ resource);
}
void canceledAfterReceivedResourceResponse(LocalFrame* frame,
@@ -142,9 +143,14 @@ void continueWithPolicyIgnore(LocalFrame* frame,
CoreProbeSink* toCoreProbeSink(WorkerGlobalScope* workerGlobalScope) {
if (!workerGlobalScope)
return nullptr;
+ WorkerThread* thread = workerGlobalScope->thread();
+ // |thread| is null after WorkerGlobalScope::dispose() is called.
+ if (!thread)
+ return nullptr;
if (WorkerInspectorController* controller =
- workerGlobalScope->thread()->workerInspectorController())
+ workerGlobalScope->thread()->workerInspectorController()) {
return controller->instrumentingAgents();
+ }
return nullptr;
}

Powered by Google App Engine
This is Rietveld 408576698