third_party/WebKit/Source/core/loader/LinkLoader.cpp - Issue 1615703002: Removal of rel=preload link elements should stop the download.

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/loader/LinkLoader.cpp

Issue 1615703002: Removal of rel=preload link elements should stop the download. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 11 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 | « third_party/WebKit/LayoutTests/http/tests/preload/dynamic_removing_preload.html ('k') | third_party/WebKit/Source/core/loader/LinkPreloadResourceClients.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/loader/LinkLoader.cpp

diff --git a/third_party/WebKit/Source/core/loader/LinkLoader.cpp b/third_party/WebKit/Source/core/loader/LinkLoader.cpp

index f29cc5e5001c93c50a76763e732ea4d70e06ac93..bd85364ae4dadb15610746bdfc9f1245a0da5a18 100644

--- a/third_party/WebKit/Source/core/loader/LinkLoader.cpp

+++ b/third_party/WebKit/Source/core/loader/LinkLoader.cpp

@@ -282,6 +282,9 @@ bool LinkLoader::loadLink(const LinkRelAttribute& relAttribute, CrossOriginAttri

if (m_client->shouldLoadLink())

createLinkPreloadResourceClient(preloadIfNeeded(relAttribute, href, document, as, LinkCalledFromMarkup));

+ if (href.isEmpty() || !href.isValid())

+ released();

// FIXME(crbug.com/323096): Should take care of import.

if ((relAttribute.isLinkPrefetch() || relAttribute.isLinkSubresource()) && href.isValid() && document.frame()) {

if (!m_client->shouldLoadLink())

@@ -323,6 +326,8 @@ void LinkLoader::released()

m_prerender->cancel();

m_prerender.clear();

}

+ if (m_linkPreloadResourceClient)

+ m_linkPreloadResourceClient->clear();

Nate Chapin 2016/01/21 21:53:17 I had actually meant deleting the LinkPreloadResou

}

DEFINE_TRACE(LinkLoader)