third_party/WebKit/Source/core/loader/PingLoader.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/PingLoader.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/NavigationScheduler.cpp ('k') | third_party/WebKit/Source/core/loader/TextResourceDecoderBuilder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 22ab060fcd8a1a3c47f2dc2fe97358aa3437bb06..bea5c41bb24ed9ef3ae3002bf3deab43a094dc5b 100644

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

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

@@ -67,7 +67,7 @@ static void finishPingRequestInitialization(ResourceRequest& request, LocalFrame

void PingLoader::loadImage(LocalFrame* frame, const KURL& url)

{

- if (!frame->document()->securityOrigin()->canDisplay(url)) {

+ if (!frame->document()->getSecurityOrigin()->canDisplay(url)) {

FrameLoader::reportLocalLoadFailed(frame, url.getString());

return;

}

@@ -117,7 +117,7 @@ void PingLoader::sendViolationReport(LocalFrame* frame, const KURL& reportURL, P

FetchInitiatorInfo initiatorInfo;

initiatorInfo.name = FetchInitiatorTypeNames::violationreport;

- PingLoader::start(frame, request, initiatorInfo, SecurityOrigin::create(reportURL)->isSameSchemeHostPort(frame->document()->securityOrigin()) ? AllowStoredCredentials : DoNotAllowStoredCredentials);

+ PingLoader::start(frame, request, initiatorInfo, SecurityOrigin::create(reportURL)->isSameSchemeHostPort(frame->document()->getSecurityOrigin()) ? AllowStoredCredentials : DoNotAllowStoredCredentials);

}

void PingLoader::start(LocalFrame* frame, ResourceRequest& request, const FetchInitiatorInfo& initiatorInfo, StoredCredentials credentialsAllowed)