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

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

Issue 2652123002: PlzNavigate: Attempt to fix blink layout tests which fail due to duplicate output from WebFrameClie… (Closed)
Patch Set: Created 3 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 /* 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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_inputPerfMetricReportPolicy( 78 m_inputPerfMetricReportPolicy(
79 InputToLoadPerfMetricReportPolicy::NoReport), 79 InputToLoadPerfMetricReportPolicy::NoReport),
80 m_redirectStatus(RedirectStatus::NoRedirect) {} 80 m_redirectStatus(RedirectStatus::NoRedirect),
81 m_navigationInitiatedByRenderer(false) {}
81 82
82 ResourceRequest::ResourceRequest(CrossThreadResourceRequestData* data) 83 ResourceRequest::ResourceRequest(CrossThreadResourceRequestData* data)
83 : ResourceRequest(data->m_url) { 84 : ResourceRequest(data->m_url) {
84 setCachePolicy(data->m_cachePolicy); 85 setCachePolicy(data->m_cachePolicy);
85 setTimeoutInterval(data->m_timeoutInterval); 86 setTimeoutInterval(data->m_timeoutInterval);
86 setFirstPartyForCookies(data->m_firstPartyForCookies); 87 setFirstPartyForCookies(data->m_firstPartyForCookies);
87 setRequestorOrigin(data->m_requestorOrigin); 88 setRequestorOrigin(data->m_requestorOrigin);
88 setHTTPMethod(AtomicString(data->m_httpMethod)); 89 setHTTPMethod(AtomicString(data->m_httpMethod));
89 setPriority(data->m_priority, data->m_intraPriorityValue); 90 setPriority(data->m_priority, data->m_intraPriorityValue);
90 91
(...skipping 17 matching lines...) Expand all
108 setFetchCredentialsMode(data->m_fetchCredentialsMode); 109 setFetchCredentialsMode(data->m_fetchCredentialsMode);
109 setFetchRedirectMode(data->m_fetchRedirectMode); 110 setFetchRedirectMode(data->m_fetchRedirectMode);
110 setPreviewsState(data->m_previewsState); 111 setPreviewsState(data->m_previewsState);
111 m_referrerPolicy = data->m_referrerPolicy; 112 m_referrerPolicy = data->m_referrerPolicy;
112 m_didSetHTTPReferrer = data->m_didSetHTTPReferrer; 113 m_didSetHTTPReferrer = data->m_didSetHTTPReferrer;
113 m_checkForBrowserSideNavigation = data->m_checkForBrowserSideNavigation; 114 m_checkForBrowserSideNavigation = data->m_checkForBrowserSideNavigation;
114 m_uiStartTime = data->m_uiStartTime; 115 m_uiStartTime = data->m_uiStartTime;
115 m_isExternalRequest = data->m_isExternalRequest; 116 m_isExternalRequest = data->m_isExternalRequest;
116 m_inputPerfMetricReportPolicy = data->m_inputPerfMetricReportPolicy; 117 m_inputPerfMetricReportPolicy = data->m_inputPerfMetricReportPolicy;
117 m_redirectStatus = data->m_redirectStatus; 118 m_redirectStatus = data->m_redirectStatus;
119 m_navigationInitiatedByRenderer = data->m_navigationInitiatedByRenderer;
118 } 120 }
119 121
120 ResourceRequest::ResourceRequest(const ResourceRequest&) = default; 122 ResourceRequest::ResourceRequest(const ResourceRequest&) = default;
121 123
122 ResourceRequest& ResourceRequest::operator=(const ResourceRequest&) = default; 124 ResourceRequest& ResourceRequest::operator=(const ResourceRequest&) = default;
123 125
124 std::unique_ptr<CrossThreadResourceRequestData> ResourceRequest::copyData() 126 std::unique_ptr<CrossThreadResourceRequestData> ResourceRequest::copyData()
125 const { 127 const {
126 std::unique_ptr<CrossThreadResourceRequestData> data = 128 std::unique_ptr<CrossThreadResourceRequestData> data =
127 WTF::makeUnique<CrossThreadResourceRequestData>(); 129 WTF::makeUnique<CrossThreadResourceRequestData>();
(...skipping 28 matching lines...) Expand all
156 data->m_fetchCredentialsMode = m_fetchCredentialsMode; 158 data->m_fetchCredentialsMode = m_fetchCredentialsMode;
157 data->m_fetchRedirectMode = m_fetchRedirectMode; 159 data->m_fetchRedirectMode = m_fetchRedirectMode;
158 data->m_previewsState = m_previewsState; 160 data->m_previewsState = m_previewsState;
159 data->m_referrerPolicy = m_referrerPolicy; 161 data->m_referrerPolicy = m_referrerPolicy;
160 data->m_didSetHTTPReferrer = m_didSetHTTPReferrer; 162 data->m_didSetHTTPReferrer = m_didSetHTTPReferrer;
161 data->m_checkForBrowserSideNavigation = m_checkForBrowserSideNavigation; 163 data->m_checkForBrowserSideNavigation = m_checkForBrowserSideNavigation;
162 data->m_uiStartTime = m_uiStartTime; 164 data->m_uiStartTime = m_uiStartTime;
163 data->m_isExternalRequest = m_isExternalRequest; 165 data->m_isExternalRequest = m_isExternalRequest;
164 data->m_inputPerfMetricReportPolicy = m_inputPerfMetricReportPolicy; 166 data->m_inputPerfMetricReportPolicy = m_inputPerfMetricReportPolicy;
165 data->m_redirectStatus = m_redirectStatus; 167 data->m_redirectStatus = m_redirectStatus;
168 data->m_navigationInitiatedByRenderer = m_navigationInitiatedByRenderer;
166 return data; 169 return data;
167 } 170 }
168 171
169 bool ResourceRequest::isEmpty() const { 172 bool ResourceRequest::isEmpty() const {
170 return m_url.isEmpty(); 173 return m_url.isEmpty();
171 } 174 }
172 175
173 bool ResourceRequest::isNull() const { 176 bool ResourceRequest::isNull() const {
174 return m_url.isNull(); 177 return m_url.isNull();
175 } 178 }
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 // layer. 418 // layer.
416 if (httpMethod() == HTTPNames::GET || httpMethod() == HTTPNames::HEAD) 419 if (httpMethod() == HTTPNames::GET || httpMethod() == HTTPNames::HEAD)
417 return false; 420 return false;
418 421
419 // For non-GET and non-HEAD methods, always send an Origin header so the 422 // For non-GET and non-HEAD methods, always send an Origin header so the
420 // server knows we support this feature. 423 // server knows we support this feature.
421 return true; 424 return true;
422 } 425 }
423 426
424 } // namespace blink 427 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698