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

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

Issue 1561903002: Fix double resource request for script resources with integrity attr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 4 years, 11 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/fetch/FetchInitiatorInfo.h" 8 #include "core/fetch/FetchInitiatorInfo.h"
9 #include "platform/CrossOriginAttributeValue.h" 9 #include "platform/CrossOriginAttributeValue.h"
10 10
(...skipping 26 matching lines...) Expand all
37 37
38 if (m_resourceType == Resource::ImportResource) { 38 if (m_resourceType == Resource::ImportResource) {
39 SecurityOrigin* securityOrigin = document->contextDocument()->securityOr igin(); 39 SecurityOrigin* securityOrigin = document->contextDocument()->securityOr igin();
40 request.setCrossOriginAccessControl(securityOrigin, CrossOriginAttribute Anonymous); 40 request.setCrossOriginAccessControl(securityOrigin, CrossOriginAttribute Anonymous);
41 } 41 }
42 if (m_crossOrigin != CrossOriginAttributeNotSet) 42 if (m_crossOrigin != CrossOriginAttributeNotSet)
43 request.setCrossOriginAccessControl(document->securityOrigin(), m_crossO rigin); 43 request.setCrossOriginAccessControl(document->securityOrigin(), m_crossO rigin);
44 request.setDefer(m_defer); 44 request.setDefer(m_defer);
45 request.setResourceWidth(m_resourceWidth); 45 request.setResourceWidth(m_resourceWidth);
46 request.clientHintsPreferences().updateFrom(m_clientHintsPreferences); 46 request.clientHintsPreferences().updateFrom(m_clientHintsPreferences);
47 request.setIntegrityMetadata(m_integrityMetadata);
47 48
48 return request; 49 return request;
49 } 50 }
50 51
51 } 52 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698