third_party/WebKit/Source/core/fetch/ResourceLoader.cpp - Issue 2316573002: PlzNavigate: Support ResourceTiming API

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/fetch/ResourceLoader.cpp

Issue 2316573002: PlzNavigate: Support ResourceTiming API (Closed)

Patch Set: Move redirect response inside the final response. Created 4 years, 3 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

« third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp ('K') | « third_party/WebKit/Source/core/fetch/ResourceLoader.h ('k') | third_party/WebKit/Source/core/loader/PingLoader.cpp » ('j') | third_party/WebKit/Source/platform/network/ResourceRequest.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/fetch/ResourceLoader.cpp

diff --git a/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp b/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp

index 5085721e81f06b478dd8247f3a6191cd55106163..6cdae8787d49cfc684ae2adbffb45a4d95a5e8db 100644

--- a/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp

+++ b/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp

@@ -123,7 +123,7 @@ void ResourceLoader::cancel()

didFail(nullptr, ResourceError::cancelledError(m_resource->lastResourceRequest().url()));

}

-void ResourceLoader::willFollowRedirect(WebURLLoader*, WebURLRequest& passedNewRequest, const WebURLResponse& passedRedirectResponse, int64_t encodedDataLength)

+void ResourceLoader::willFollowRedirect(WebURLLoader*, WebURLRequest& passedNewRequest, const WebURLResponse& passedRedirectResponse)

{

ASSERT(!passedNewRequest.isNull());

ASSERT(!passedRedirectResponse.isNull());

@@ -132,7 +132,7 @@ void ResourceLoader::willFollowRedirect(WebURLLoader*, WebURLRequest& passedNewR

const ResourceResponse& redirectResponse(passedRedirectResponse.toResourceResponse());

newRequest.setRedirectStatus(ResourceRequest::RedirectStatus::FollowedRedirect);

- if (m_fetcher->willFollowRedirect(m_resource.get(), newRequest, redirectResponse, encodedDataLength)) {

+ if (m_fetcher->willFollowRedirect(m_resource.get(), newRequest, redirectResponse)) {

m_resource->willFollowRedirect(newRequest, redirectResponse);

} else {

m_resource->willNotFollowRedirect();