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

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

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

index 958e886b97584d698716acfab3382980423b55b3..c7461a1f9ae2b901d9f2325e9a4a8aca9a974237 100644

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

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

@@ -110,10 +110,10 @@ bool TextTrackLoader::load(const KURL& url, CrossOriginAttributeValue crossOrigi

FetchRequest cueRequest(ResourceRequest(document().completeURL(url)), FetchInitiatorTypeNames::texttrack);

if (crossOrigin != CrossOriginAttributeNotSet) {

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

- } else if (!document().securityOrigin()->canRequestNoSuborigin(url)) {

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

+ } else if (!document().getSecurityOrigin()->canRequestNoSuborigin(url)) {

// Text track elements without 'crossorigin' set on the parent are "No CORS"; report error if not same-origin.

- corsPolicyPreventedLoad(document().securityOrigin(), url);

+ corsPolicyPreventedLoad(document().getSecurityOrigin(), url);

return false;

}