third_party/WebKit/Source/core/loader/LinkLoader.cpp - Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide.

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 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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/Source/core/loader/ImageLoader.cpp ('k') | third_party/WebKit/Source/core/loader/MixedContentChecker.cpp » ('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 9f0beda2ac8f70b0e10b4aeed3bc7ac21e8b8f48..024c8177dbb1de369c84d132dbdd11f993c98b45 100644

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

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

@@ -277,7 +277,7 @@ static Resource* preloadIfNeeded(const LinkRelAttribute& relAttribute, const KUR

linkRequest.setPriority(document.fetcher()->loadPriority(resourceType, linkRequest));

if (crossOrigin != CrossOriginAttributeNotSet)

- linkRequest.setCrossOriginAccessControl(document.securityOrigin(), crossOrigin);

+ linkRequest.setCrossOriginAccessControl(document.getSecurityOrigin(), crossOrigin);

Settings* settings = document.settings();

if (settings && settings->logPreload())

document.addConsoleMessage(ConsoleMessage::create(OtherMessageSource, DebugMessageLevel, String("Preload triggered for " + href.host() + href.path())));

@@ -341,7 +341,7 @@ bool LinkLoader::loadLink(const LinkRelAttribute& relAttribute, CrossOriginAttri

FetchRequest linkRequest(ResourceRequest(document.completeURL(href)), FetchInitiatorTypeNames::link);

if (crossOrigin != CrossOriginAttributeNotSet)

- linkRequest.setCrossOriginAccessControl(document.securityOrigin(), crossOrigin);

+ linkRequest.setCrossOriginAccessControl(document.getSecurityOrigin(), crossOrigin);

setResource(LinkFetchResource::fetch(Resource::LinkPrefetch, linkRequest, document.fetcher()));

}