third_party/WebKit/Source/core/dom/ScriptLoader.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/dom/ScriptLoader.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/dom/ScopedWindowFocusAllowedIndicator.h ('k') | third_party/WebKit/Source/core/dom/ScriptedIdleTaskController.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/dom/ScriptLoader.cpp

diff --git a/third_party/WebKit/Source/core/dom/ScriptLoader.cpp b/third_party/WebKit/Source/core/dom/ScriptLoader.cpp

index a89f7df4387c5f1ba1c51a6dc57a314d0a71e1e0..b33f34f19aa2891a85c1daa62870e688f9a8b4e0 100644

--- a/third_party/WebKit/Source/core/dom/ScriptLoader.cpp

+++ b/third_party/WebKit/Source/core/dom/ScriptLoader.cpp

@@ -293,7 +293,7 @@ bool ScriptLoader::fetchScript(const String& sourceUrl, FetchRequest::DeferOptio

CrossOriginAttributeValue crossOrigin = crossOriginAttributeValue(m_element->fastGetAttribute(HTMLNames::crossoriginAttr));

if (crossOrigin != CrossOriginAttributeNotSet)

- request.setCrossOriginAccessControl(elementDocument->securityOrigin(), crossOrigin);

+ request.setCrossOriginAccessControl(elementDocument->getSecurityOrigin(), crossOrigin);

request.setCharset(scriptCharset());

// Skip fetch-related CSP checks if the script element has a valid nonce, or if dynamically

@@ -340,7 +340,7 @@ void ScriptLoader::logScriptMimetype(ScriptResource* resource, LocalFrame* frame

bool text = mimetype.lower().startsWith("text/");

bool application = mimetype.lower().startsWith("application/");

bool expectedJs = MIMETypeRegistry::isSupportedJavaScriptMIMEType(mimetype) || (text && isLegacySupportedJavaScriptLanguage(mimetype.substring(5)));

- bool sameOrigin = m_element->document().securityOrigin()->canRequest(m_resource->url());

+ bool sameOrigin = m_element->document().getSecurityOrigin()->canRequest(m_resource->url());

if (expectedJs) {

return;

}

@@ -405,7 +405,7 @@ bool ScriptLoader::executeScript(const ScriptSourceCode& sourceCode, double* com

accessControlStatus = OpaqueResource;

else

accessControlStatus = SharableCrossOrigin;

- } else if (sourceCode.resource()->passesAccessControlCheck(m_element->document().securityOrigin())) {

+ } else if (sourceCode.resource()->passesAccessControlCheck(m_element->document().getSecurityOrigin())) {

accessControlStatus = SharableCrossOrigin;

}