third_party/WebKit/Source/core/html/parser/PreloadRequest.cpp - Issue 1987413002: Add link preload as=document support

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

Issue 1987413002: Add link preload as=document support Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: crash fix Created 4 years, 3 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

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 17 matching lines...) Expand all Loading...
28	28

29 FetchRequest PreloadRequest::resourceRequest(Document* document)	29 FetchRequest PreloadRequest::resourceRequest(Document* document)

30 {	30 {

31 ASSERT(isMainThread());	31 ASSERT(isMainThread());

32 FetchInitiatorInfo initiatorInfo;	32 FetchInitiatorInfo initiatorInfo;

33 initiatorInfo.name = AtomicString(m_initiatorName);	33 initiatorInfo.name = AtomicString(m_initiatorName);

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 if (m_resourceType == Resource::MainResource)

	39 resourceRequest.setFrameType(WebURLRequest::FrameTypePreload);

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

39	41

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

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

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

43 }	45 }

44 if (m_crossOrigin != CrossOriginAttributeNotSet)	46 if (m_crossOrigin != CrossOriginAttributeNotSet)

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

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

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

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

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

50 request.setContentSecurityPolicyNonce(m_nonce);	52 request.setContentSecurityPolicyNonce(m_nonce);

51	53

52 if (m_requestType == RequestTypeLinkRelPreload)	54 if (m_requestType == RequestTypeLinkRelPreload)

53 request.setLinkPreload(true);	55 request.setLinkPreload(true);

54 return request;	56 return request;

55 }	57 }

56	58

57 } // namespace blink	59 } // namespace blink

OLD	NEW