OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
97 | 97 |
98 if (m_state == Finished && m_cueParser) | 98 if (m_state == Finished && m_cueParser) |
99 m_cueParser->flush(); | 99 m_cueParser->flush(); |
100 | 100 |
101 if (!m_cueLoadTimer.isActive()) | 101 if (!m_cueLoadTimer.isActive()) |
102 m_cueLoadTimer.startOneShot(0); | 102 m_cueLoadTimer.startOneShot(0); |
103 | 103 |
104 cancelLoad(); | 104 cancelLoad(); |
105 } | 105 } |
106 | 106 |
107 bool TextTrackLoader::load(const KURL& url, const String& crossOriginMode) | 107 bool TextTrackLoader::load(const KURL& url, const AtomicString& crossOriginMode) |
108 { | 108 { |
109 cancelLoad(); | 109 cancelLoad(); |
110 | 110 |
111 FetchRequest cueRequest(ResourceRequest(m_document.completeURL(url)), FetchI
nitiatorTypeNames::texttrack); | 111 FetchRequest cueRequest(ResourceRequest(m_document.completeURL(url)), FetchI
nitiatorTypeNames::texttrack); |
112 | 112 |
113 if (!crossOriginMode.isNull()) { | 113 if (!crossOriginMode.isNull()) { |
114 StoredCredentials allowCredentials = equalIgnoringCase(crossOriginMode,
"use-credentials") ? AllowStoredCredentials : DoNotAllowStoredCredentials; | 114 cueRequest.setCrossOriginAccessControl(m_document.securityOrigin(), cros
sOriginMode); |
115 cueRequest.setCrossOriginAccessControl(m_document.securityOrigin(), allo
wCredentials); | |
116 } else if (!m_document.securityOrigin()->canRequest(url)) { | 115 } else if (!m_document.securityOrigin()->canRequest(url)) { |
117 // Text track elements without 'crossorigin' set on the parent are "No C
ORS"; report error if not same-origin. | 116 // Text track elements without 'crossorigin' set on the parent are "No C
ORS"; report error if not same-origin. |
118 corsPolicyPreventedLoad(m_document.securityOrigin(), url); | 117 corsPolicyPreventedLoad(m_document.securityOrigin(), url); |
119 return false; | 118 return false; |
120 } | 119 } |
121 | 120 |
122 ResourceFetcher* fetcher = m_document.fetcher(); | 121 ResourceFetcher* fetcher = m_document.fetcher(); |
123 setResource(fetcher->fetchRawResource(cueRequest)); | 122 setResource(fetcher->fetchRawResource(cueRequest)); |
124 return resource(); | 123 return resource(); |
125 } | 124 } |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 } | 157 } |
159 | 158 |
160 void TextTrackLoader::getNewRegions(Vector<RefPtr<VTTRegion> >& outputRegions) | 159 void TextTrackLoader::getNewRegions(Vector<RefPtr<VTTRegion> >& outputRegions) |
161 { | 160 { |
162 ASSERT(m_cueParser); | 161 ASSERT(m_cueParser); |
163 if (m_cueParser) | 162 if (m_cueParser) |
164 m_cueParser->getNewRegions(outputRegions); | 163 m_cueParser->getNewRegions(outputRegions); |
165 } | 164 } |
166 | 165 |
167 } | 166 } |
OLD | NEW |