| 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 3c1216bea6fc3d34a18c3bb16549cb6e5c5b45dc..ef84e2f0d18e07b1f97d8406842eeb014f7c3e30 100644
|
| --- a/third_party/WebKit/Source/core/loader/TextTrackLoader.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/TextTrackLoader.cpp
|
| @@ -105,14 +105,14 @@ void TextTrackLoader::notifyFinished(Resource* resource)
|
| cancelLoad();
|
| }
|
|
|
| -bool TextTrackLoader::load(const KURL& url, const AtomicString& crossOriginMode)
|
| +bool TextTrackLoader::load(const KURL& url, CrossOriginAttributeValue crossOrigin)
|
| {
|
| cancelLoad();
|
|
|
| FetchRequest cueRequest(ResourceRequest(document().completeURL(url)), FetchInitiatorTypeNames::texttrack);
|
|
|
| - if (!crossOriginMode.isNull()) {
|
| - cueRequest.setCrossOriginAccessControl(document().securityOrigin(), crossOriginMode);
|
| + if (crossOrigin != CrossOriginAttributeNotSet) {
|
| + cueRequest.setCrossOriginAccessControl(document().securityOrigin(), crossOrigin);
|
| } else if (!document().securityOrigin()->canRequestNoSuborigin(url)) {
|
| // Text track elements without 'crossorigin' set on the parent are "No CORS"; report error if not same-origin.
|
| corsPolicyPreventedLoad(document().securityOrigin(), url);
|
|
|