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

Unified Diff: third_party/WebKit/Source/core/loader/FrameFetchContext.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
Index: third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
index 1df10fbfffb9ab292be649bb88d6e077cc78b070..ed3e8379ede40c59636c8a5a76a6c4e829e334fe 100644
--- a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
@@ -102,7 +102,7 @@ void FrameFetchContext::addAdditionalRequestHeaders(ResourceRequest& request, Fe
RefPtr<SecurityOrigin> outgoingOrigin;
if (!request.didSetHTTPReferrer()) {
ASSERT(m_document);
- outgoingOrigin = m_document->securityOrigin();
+ outgoingOrigin = m_document->getSecurityOrigin();
request.setHTTPReferrer(SecurityPolicy::generateReferrer(m_document->getReferrerPolicy(), request.url(), m_document->outgoingReferrer()));
} else {
RELEASE_ASSERT(SecurityPolicy::generateReferrer(request.getReferrerPolicy(), request.url(), request.httpReferrer()).referrer == request.httpReferrer());
@@ -411,7 +411,7 @@ ResourceRequestBlockedReason FrameFetchContext::canRequestInternal(Resource::Typ
SecurityOrigin* securityOrigin = options.securityOrigin.get();
if (!securityOrigin && m_document)
- securityOrigin = m_document->securityOrigin();
+ securityOrigin = m_document->getSecurityOrigin();
if (originRestriction != FetchRequest::NoOriginRestriction && securityOrigin && !securityOrigin->canDisplay(url)) {
if (!forPreload)
@@ -547,7 +547,7 @@ ResourceRequestBlockedReason FrameFetchContext::canRequestInternal(Resource::Typ
// block them at some point in the future.
if (resourceRequest.frameType() != WebURLRequest::FrameTypeTopLevel) {
ASSERT(frame()->document());
- if (SchemeRegistry::shouldTreatURLSchemeAsLegacy(url.protocol()) && !SchemeRegistry::shouldTreatURLSchemeAsLegacy(frame()->document()->securityOrigin()->protocol()))
+ if (SchemeRegistry::shouldTreatURLSchemeAsLegacy(url.protocol()) && !SchemeRegistry::shouldTreatURLSchemeAsLegacy(frame()->document()->getSecurityOrigin()->protocol()))
UseCounter::count(frame()->document(), UseCounter::LegacyProtocolEmbeddedAsSubresource);
if (!url.user().isEmpty() || !url.pass().isEmpty())
UseCounter::count(frame()->document(), UseCounter::RequestedSubresourceWithEmbeddedCredentials);
@@ -640,9 +640,9 @@ void FrameFetchContext::addConsoleMessage(const String& message) const
frame()->document()->addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, message));
}
-SecurityOrigin* FrameFetchContext::securityOrigin() const
+SecurityOrigin* FrameFetchContext::getSecurityOrigin() const
{
- return m_document ? m_document->securityOrigin() : nullptr;
+ return m_document ? m_document->getSecurityOrigin() : nullptr;
}
void FrameFetchContext::upgradeInsecureRequest(FetchRequest& fetchRequest)
« no previous file with comments | « third_party/WebKit/Source/core/loader/FrameFetchContext.h ('k') | third_party/WebKit/Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698