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

Unified Diff: Source/core/loader/FrameFetchContext.cpp

Issue 967893002: Have FrameFetchContext check for frame detached status more often. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « Source/core/loader/FrameFetchContext.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/FrameFetchContext.cpp
diff --git a/Source/core/loader/FrameFetchContext.cpp b/Source/core/loader/FrameFetchContext.cpp
index 5623ed1db211d4c019dcf73c27ce2505afa029c6..54c9e181b77ce4413a7abe8aa35cd8dbb0ce729e 100644
--- a/Source/core/loader/FrameFetchContext.cpp
+++ b/Source/core/loader/FrameFetchContext.cpp
@@ -75,6 +75,9 @@ void FrameFetchContext::reportLocalLoadFailed(const KURL& url)
void FrameFetchContext::addAdditionalRequestHeaders(Document* document, ResourceRequest& request, FetchResourceType type)
{
+ if (!frame())
+ return;
+
bool isMainResource = type == FetchMainResource;
if (!isMainResource) {
String outgoingOrigin;
@@ -98,6 +101,9 @@ void FrameFetchContext::addAdditionalRequestHeaders(Document* document, Resource
void FrameFetchContext::setFirstPartyForCookies(ResourceRequest& request)
{
+ if (!frame())
+ return;
+
if (frame()->tree().top()->isLocalFrame())
request.setFirstPartyForCookies(toLocalFrame(frame()->tree().top())->document()->firstPartyForCookies());
}
@@ -142,11 +148,17 @@ inline DocumentLoader* FrameFetchContext::ensureLoader(DocumentLoader* loader)
void FrameFetchContext::dispatchDidChangeResourcePriority(unsigned long identifier, ResourceLoadPriority loadPriority, int intraPriorityValue)
{
+ if (!frame())
+ return;
+
frame()->loader().client()->dispatchDidChangeResourcePriority(identifier, loadPriority, intraPriorityValue);
}
void FrameFetchContext::dispatchWillSendRequest(DocumentLoader* loader, unsigned long identifier, ResourceRequest& request, const ResourceResponse& redirectResponse, const FetchInitiatorInfo& initiatorInfo)
{
+ if (!frame())
+ return;
+
frame()->loader().applyUserAgent(request);
frame()->loader().client()->dispatchWillSendRequest(loader, identifier, request, redirectResponse);
TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ResourceSendRequest", "data", InspectorSendRequestEvent::data(identifier, frame(), request));
@@ -155,11 +167,17 @@ void FrameFetchContext::dispatchWillSendRequest(DocumentLoader* loader, unsigned
void FrameFetchContext::dispatchDidLoadResourceFromMemoryCache(const ResourceRequest& request, const ResourceResponse& response)
{
+ if (!frame())
+ return;
+
frame()->loader().client()->dispatchDidLoadResourceFromMemoryCache(request, response);
}
void FrameFetchContext::dispatchDidReceiveResponse(DocumentLoader* loader, unsigned long identifier, const ResourceResponse& r, ResourceLoader* resourceLoader)
{
+ if (!frame())
+ return;
+
frame()->loader().progress().incrementProgress(identifier, r);
frame()->loader().client()->dispatchDidReceiveResponse(loader, identifier, r);
TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ResourceReceiveResponse", "data", InspectorReceiveResponseEvent::data(identifier, frame(), r));
@@ -171,6 +189,9 @@ void FrameFetchContext::dispatchDidReceiveResponse(DocumentLoader* loader, unsig
void FrameFetchContext::dispatchDidReceiveData(DocumentLoader*, unsigned long identifier, const char* data, int dataLength, int encodedDataLength)
{
+ if (!frame())
+ return;
+
frame()->loader().progress().incrementProgress(identifier, dataLength);
TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ResourceReceivedData", "data", InspectorReceiveDataEvent::data(identifier, frame(), encodedDataLength));
InspectorInstrumentation::didReceiveData(frame(), identifier, data, dataLength, encodedDataLength);
@@ -178,6 +199,9 @@ void FrameFetchContext::dispatchDidReceiveData(DocumentLoader*, unsigned long id
void FrameFetchContext::dispatchDidDownloadData(DocumentLoader*, unsigned long identifier, int dataLength, int encodedDataLength)
{
+ if (!frame())
+ return;
+
frame()->loader().progress().incrementProgress(identifier, dataLength);
TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ResourceReceivedData", "data", InspectorReceiveDataEvent::data(identifier, frame(), encodedDataLength));
InspectorInstrumentation::didReceiveData(frame(), identifier, 0, dataLength, encodedDataLength);
@@ -185,6 +209,9 @@ void FrameFetchContext::dispatchDidDownloadData(DocumentLoader*, unsigned long i
void FrameFetchContext::dispatchDidFinishLoading(DocumentLoader* loader, unsigned long identifier, double finishTime, int64_t encodedDataLength)
{
+ if (!frame())
+ return;
+
frame()->loader().progress().completeProgress(identifier);
frame()->loader().client()->dispatchDidFinishLoading(loader, identifier);
« no previous file with comments | « Source/core/loader/FrameFetchContext.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698