Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

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

Issue 2855163002: Avoid sending mixed-content requests for ImageSet contexts (Closed)
Patch Set: Better check and a test Created 3 years, 7 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
OLDNEW
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/dom/DocumentWriteIntervention.h" 8 #include "core/dom/DocumentWriteIntervention.h"
9 #include "core/loader/DocumentLoader.h" 9 #include "core/loader/DocumentLoader.h"
10 #include "platform/CrossOriginAttributeValue.h" 10 #include "platform/CrossOriginAttributeValue.h"
(...skipping 27 matching lines...) Expand all
38 const KURL& url = CompleteURL(document); 38 const KURL& url = CompleteURL(document);
39 // Data URLs are filtered out in the preload scanner. 39 // Data URLs are filtered out in the preload scanner.
40 DCHECK(!url.ProtocolIsData()); 40 DCHECK(!url.ProtocolIsData());
41 41
42 ResourceRequest resource_request(url); 42 ResourceRequest resource_request(url);
43 resource_request.SetHTTPReferrer(SecurityPolicy::GenerateReferrer( 43 resource_request.SetHTTPReferrer(SecurityPolicy::GenerateReferrer(
44 referrer_policy_, url, 44 referrer_policy_, url,
45 referrer_source_ == kBaseUrlIsReferrer 45 referrer_source_ == kBaseUrlIsReferrer
46 ? base_url_.StrippedForUseAsReferrer() 46 ? base_url_.StrippedForUseAsReferrer()
47 : document->OutgoingReferrer())); 47 : document->OutgoingReferrer()));
48 resource_request.SetRequestContext( 48 resource_request.SetRequestContext(ResourceFetcher::DetermineRequestContext(
49 ResourceFetcher::DetermineRequestContext(resource_type_, false)); 49 resource_type_, is_image_set_, false));
50 50
51 if (resource_type_ == Resource::kScript) 51 if (resource_type_ == Resource::kScript)
52 MaybeDisallowFetchForDocWrittenScript(resource_request, defer_, *document); 52 MaybeDisallowFetchForDocWrittenScript(resource_request, defer_, *document);
53 53
54 FetchParameters params(resource_request, initiator_info); 54 FetchParameters params(resource_request, initiator_info);
55 55
56 if (resource_type_ == Resource::kImportResource) { 56 if (resource_type_ == Resource::kImportResource) {
57 SecurityOrigin* security_origin = 57 SecurityOrigin* security_origin =
58 document->ContextDocument()->GetSecurityOrigin(); 58 document->ContextDocument()->GetSecurityOrigin();
59 params.SetCrossOriginAccessControl(security_origin, 59 params.SetCrossOriginAccessControl(security_origin,
(...skipping 26 matching lines...) Expand all
86 if (from_insertion_scanner_) { 86 if (from_insertion_scanner_) {
87 speculative_preload_type = 87 speculative_preload_type =
88 FetchParameters::SpeculativePreloadType::kInserted; 88 FetchParameters::SpeculativePreloadType::kInserted;
89 } 89 }
90 params.SetSpeculativePreloadType(speculative_preload_type, discovery_time_); 90 params.SetSpeculativePreloadType(speculative_preload_type, discovery_time_);
91 91
92 return document->Loader()->StartPreload(resource_type_, params); 92 return document->Loader()->StartPreload(resource_type_, params);
93 } 93 }
94 94
95 } // namespace blink 95 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/parser/PreloadRequest.h ('k') | third_party/WebKit/Source/core/loader/LinkLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698