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

Side by Side Diff: third_party/WebKit/Source/platform/network/ResourceRequest.cpp

Issue 2053693002: WIP: Move 'Upgrade-Insecure-Requests' to the browser process. Base URL: https://chromium.googlesource.com/chromium/src.git@replicate
Patch Set: Rebase. :( Created 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003, 2006 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2003, 2006 Apple Computer, Inc. All rights reserved.
3 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. 3 * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 m_fetchRequestMode(WebURLRequest::FetchRequestModeNoCORS), 69 m_fetchRequestMode(WebURLRequest::FetchRequestModeNoCORS),
70 m_fetchCredentialsMode(WebURLRequest::FetchCredentialsModeInclude), 70 m_fetchCredentialsMode(WebURLRequest::FetchCredentialsModeInclude),
71 m_fetchRedirectMode(WebURLRequest::FetchRedirectModeFollow), 71 m_fetchRedirectMode(WebURLRequest::FetchRedirectModeFollow),
72 m_previewsState(WebURLRequest::PreviewsUnspecified), 72 m_previewsState(WebURLRequest::PreviewsUnspecified),
73 m_referrerPolicy(ReferrerPolicyDefault), 73 m_referrerPolicy(ReferrerPolicyDefault),
74 m_didSetHTTPReferrer(false), 74 m_didSetHTTPReferrer(false),
75 m_checkForBrowserSideNavigation(true), 75 m_checkForBrowserSideNavigation(true),
76 m_uiStartTime(0), 76 m_uiStartTime(0),
77 m_isExternalRequest(false), 77 m_isExternalRequest(false),
78 m_isSameDocumentNavigation(false), 78 m_isSameDocumentNavigation(false),
79 m_insecureRequestPolicy(kLeaveInsecureRequestsAlone),
79 m_inputPerfMetricReportPolicy( 80 m_inputPerfMetricReportPolicy(
80 InputToLoadPerfMetricReportPolicy::NoReport), 81 InputToLoadPerfMetricReportPolicy::NoReport),
81 m_redirectStatus(RedirectStatus::NoRedirect) {} 82 m_redirectStatus(RedirectStatus::NoRedirect) {}
82 83
83 ResourceRequest::ResourceRequest(CrossThreadResourceRequestData* data) 84 ResourceRequest::ResourceRequest(CrossThreadResourceRequestData* data)
84 : ResourceRequest(data->m_url) { 85 : ResourceRequest(data->m_url) {
85 setCachePolicy(data->m_cachePolicy); 86 setCachePolicy(data->m_cachePolicy);
86 setTimeoutInterval(data->m_timeoutInterval); 87 setTimeoutInterval(data->m_timeoutInterval);
87 setFirstPartyForCookies(data->m_firstPartyForCookies); 88 setFirstPartyForCookies(data->m_firstPartyForCookies);
88 setRequestorOrigin(data->m_requestorOrigin); 89 setRequestorOrigin(data->m_requestorOrigin);
(...skipping 18 matching lines...) Expand all
107 setFrameType(data->m_frameType); 108 setFrameType(data->m_frameType);
108 setFetchRequestMode(data->m_fetchRequestMode); 109 setFetchRequestMode(data->m_fetchRequestMode);
109 setFetchCredentialsMode(data->m_fetchCredentialsMode); 110 setFetchCredentialsMode(data->m_fetchCredentialsMode);
110 setFetchRedirectMode(data->m_fetchRedirectMode); 111 setFetchRedirectMode(data->m_fetchRedirectMode);
111 setPreviewsState(data->m_previewsState); 112 setPreviewsState(data->m_previewsState);
112 m_referrerPolicy = data->m_referrerPolicy; 113 m_referrerPolicy = data->m_referrerPolicy;
113 m_didSetHTTPReferrer = data->m_didSetHTTPReferrer; 114 m_didSetHTTPReferrer = data->m_didSetHTTPReferrer;
114 m_checkForBrowserSideNavigation = data->m_checkForBrowserSideNavigation; 115 m_checkForBrowserSideNavigation = data->m_checkForBrowserSideNavigation;
115 m_uiStartTime = data->m_uiStartTime; 116 m_uiStartTime = data->m_uiStartTime;
116 m_isExternalRequest = data->m_isExternalRequest; 117 m_isExternalRequest = data->m_isExternalRequest;
118 m_insecureRequestPolicy = data->m_insecureRequestPolicy;
117 m_inputPerfMetricReportPolicy = data->m_inputPerfMetricReportPolicy; 119 m_inputPerfMetricReportPolicy = data->m_inputPerfMetricReportPolicy;
118 m_redirectStatus = data->m_redirectStatus; 120 m_redirectStatus = data->m_redirectStatus;
119 } 121 }
120 122
121 ResourceRequest::ResourceRequest(const ResourceRequest&) = default; 123 ResourceRequest::ResourceRequest(const ResourceRequest&) = default;
122 124
123 ResourceRequest& ResourceRequest::operator=(const ResourceRequest&) = default; 125 ResourceRequest& ResourceRequest::operator=(const ResourceRequest&) = default;
124 126
125 std::unique_ptr<CrossThreadResourceRequestData> ResourceRequest::copyData() 127 std::unique_ptr<CrossThreadResourceRequestData> ResourceRequest::copyData()
126 const { 128 const {
(...skipping 28 matching lines...) Expand all
155 data->m_frameType = m_frameType; 157 data->m_frameType = m_frameType;
156 data->m_fetchRequestMode = m_fetchRequestMode; 158 data->m_fetchRequestMode = m_fetchRequestMode;
157 data->m_fetchCredentialsMode = m_fetchCredentialsMode; 159 data->m_fetchCredentialsMode = m_fetchCredentialsMode;
158 data->m_fetchRedirectMode = m_fetchRedirectMode; 160 data->m_fetchRedirectMode = m_fetchRedirectMode;
159 data->m_previewsState = m_previewsState; 161 data->m_previewsState = m_previewsState;
160 data->m_referrerPolicy = m_referrerPolicy; 162 data->m_referrerPolicy = m_referrerPolicy;
161 data->m_didSetHTTPReferrer = m_didSetHTTPReferrer; 163 data->m_didSetHTTPReferrer = m_didSetHTTPReferrer;
162 data->m_checkForBrowserSideNavigation = m_checkForBrowserSideNavigation; 164 data->m_checkForBrowserSideNavigation = m_checkForBrowserSideNavigation;
163 data->m_uiStartTime = m_uiStartTime; 165 data->m_uiStartTime = m_uiStartTime;
164 data->m_isExternalRequest = m_isExternalRequest; 166 data->m_isExternalRequest = m_isExternalRequest;
167 data->m_insecureRequestPolicy = m_insecureRequestPolicy;
165 data->m_inputPerfMetricReportPolicy = m_inputPerfMetricReportPolicy; 168 data->m_inputPerfMetricReportPolicy = m_inputPerfMetricReportPolicy;
166 data->m_redirectStatus = m_redirectStatus; 169 data->m_redirectStatus = m_redirectStatus;
167 return data; 170 return data;
168 } 171 }
169 172
170 bool ResourceRequest::isEmpty() const { 173 bool ResourceRequest::isEmpty() const {
171 return m_url.isEmpty(); 174 return m_url.isEmpty();
172 } 175 }
173 176
174 bool ResourceRequest::isNull() const { 177 bool ResourceRequest::isNull() const {
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 // layer. 419 // layer.
417 if (httpMethod() == HTTPNames::GET || httpMethod() == HTTPNames::HEAD) 420 if (httpMethod() == HTTPNames::GET || httpMethod() == HTTPNames::HEAD)
418 return false; 421 return false;
419 422
420 // For non-GET and non-HEAD methods, always send an Origin header so the 423 // For non-GET and non-HEAD methods, always send an Origin header so the
421 // server knows we support this feature. 424 // server knows we support this feature.
422 return true; 425 return true;
423 } 426 }
424 427
425 } // namespace blink 428 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698