third_party/WebKit/Source/core/html/parser/PreloadRequest.cpp - Issue 1801513003: Cross origin requests to same origin should match

Side by Side Diff: third_party/WebKit/Source/core/html/parser/PreloadRequest.cpp

Issue 1801513003: Cross origin requests to same origin should match Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed failing CORS tests 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 unified diff | Download patch

« third_party/WebKit/Source/core/fetch/ResourceLoaderOptions.cpp ('K') | « third_party/WebKit/Source/core/html/HTMLLinkElement.cpp ('k') | third_party/WebKit/Source/core/loader/ImageLoader.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 "core/html/parser/PreloadRequest.h"	5 #include "core/html/parser/PreloadRequest.h"

6	6

7 #include "core/dom/Document.h"	7 #include "core/dom/Document.h"

8 #include "core/fetch/FetchInitiatorInfo.h"	8 #include "core/fetch/FetchInitiatorInfo.h"

9 #include "core/fetch/ResourceFetcher.h"	9 #include "core/fetch/ResourceFetcher.h"

10 #include "platform/CrossOriginAttributeValue.h"	10 #include "platform/CrossOriginAttributeValue.h"

(...skipping 23 matching lines...) Expand all Loading...
34 initiatorInfo.position = m_initiatorPosition;	34 initiatorInfo.position = m_initiatorPosition;

35 ResourceRequest resourceRequest(completeURL(document));	35 ResourceRequest resourceRequest(completeURL(document));

36 resourceRequest.setHTTPReferrer(SecurityPolicy::generateReferrer(m_referrerP olicy, resourceRequest.url(), document->outgoingReferrer()));	36 resourceRequest.setHTTPReferrer(SecurityPolicy::generateReferrer(m_referrerP olicy, resourceRequest.url(), document->outgoingReferrer()));

37 ResourceFetcher::determineRequestContext(resourceRequest, m_resourceType, fa lse);	37 ResourceFetcher::determineRequestContext(resourceRequest, m_resourceType, fa lse);

38 FetchRequest request(resourceRequest, initiatorInfo);	38 FetchRequest request(resourceRequest, initiatorInfo);

39	39

40 if (m_resourceType == Resource::ImportResource) {	40 if (m_resourceType == Resource::ImportResource) {

41 SecurityOrigin* securityOrigin = document->contextDocument()->getSecurit yOrigin();	41 SecurityOrigin* securityOrigin = document->contextDocument()->getSecurit yOrigin();

42 request.setCrossOriginAccessControl(securityOrigin, CrossOriginAttribute Anonymous);	42 request.setCrossOriginAccessControl(securityOrigin, CrossOriginAttribute Anonymous);

43 }	43 }

44 if (m_crossOrigin != CrossOriginAttributeNotSet)	44 request.setCrossOriginAccessControl(document->getSecurityOrigin(), m_crossOr igin);

45 request.setCrossOriginAccessControl(document->getSecurityOrigin(), m_cro ssOrigin);

46 request.setDefer(m_defer);	45 request.setDefer(m_defer);

47 request.setResourceWidth(m_resourceWidth);	46 request.setResourceWidth(m_resourceWidth);

48 request.clientHintsPreferences().updateFrom(m_clientHintsPreferences);	47 request.clientHintsPreferences().updateFrom(m_clientHintsPreferences);

49 request.setIntegrityMetadata(m_integrityMetadata);	48 request.setIntegrityMetadata(m_integrityMetadata);

50	49

51 if (m_requestType == RequestTypeLinkRelPreload)	50 if (m_requestType == RequestTypeLinkRelPreload)

52 request.setLinkPreload(true);	51 request.setLinkPreload(true);

53 return request;	52 return request;

54 }	53 }

55	54

56 } // namespace blink	55 } // namespace blink

OLD	NEW