Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 #include "core/html/parser/PreloadRequest.h" | 6 #include "core/html/parser/PreloadRequest.h" |
| 7 | 7 |
| 8 #include "core/dom/Document.h" | 8 #include "core/dom/Document.h" |
| 9 #include "core/fetch/FetchInitiatorInfo.h" | 9 #include "core/fetch/FetchInitiatorInfo.h" |
| 10 | 10 |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 24 } | 24 } |
| 25 | 25 |
| 26 FetchRequest PreloadRequest::resourceRequest(Document* document) | 26 FetchRequest PreloadRequest::resourceRequest(Document* document) |
| 27 { | 27 { |
| 28 ASSERT(isMainThread()); | 28 ASSERT(isMainThread()); |
| 29 FetchInitiatorInfo initiatorInfo; | 29 FetchInitiatorInfo initiatorInfo; |
| 30 initiatorInfo.name = AtomicString(m_initiatorName); | 30 initiatorInfo.name = AtomicString(m_initiatorName); |
| 31 initiatorInfo.position = m_initiatorPosition; | 31 initiatorInfo.position = m_initiatorPosition; |
| 32 FetchRequest request(ResourceRequest(completeURL(document)), initiatorInfo); | 32 FetchRequest request(ResourceRequest(completeURL(document)), initiatorInfo); |
| 33 | 33 |
| 34 if (m_resourceType == Resource::ImportResource) { | |
| 35 SecurityOrigin* securityOrigin = document->contextDocument()->securityOr igin(); | |
| 36 bool sameOrigin = securityOrigin->canRequest(request.url()); | |
| 37 request.setCrossOriginAccessControl(securityOrigin, | |
| 38 sameOrigin ? AllowStoredCredentials : DoNotAllowStoredCredentials, | |
| 39 ClientDidNotRequestCredentials); | |
| 40 } | |
| 41 | |
|
Yoav Weiss
2015/06/11 10:50:47
OK, so that corresponds to http://w3c.github.io/we
Mike West
2015/06/12 07:33:04
How does this deal with redirects? Otherwise it lo
yoichio
2015/06/16 05:13:09
CrossOriginAccessControl::handleRedirect also take
| |
| 34 if (m_isCORSEnabled) | 42 if (m_isCORSEnabled) |
| 35 request.setCrossOriginAccessControl(document->securityOrigin(), m_allowC redentials); | 43 request.setCrossOriginAccessControl(document->securityOrigin(), m_allowC redentials); |
| 36 | 44 |
| 37 request.setDefer(m_defer); | 45 request.setDefer(m_defer); |
| 38 request.setResourceWidth(m_resourceWidth); | 46 request.setResourceWidth(m_resourceWidth); |
| 39 request.setClientHintsPreferences(m_clientHintsPreferences); | 47 request.setClientHintsPreferences(m_clientHintsPreferences); |
| 40 | 48 |
| 41 return request; | 49 return request; |
| 42 } | 50 } |
| 43 | 51 |
| 44 } | 52 } |
| OLD | NEW |