| OLD | NEW |
| 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 11 matching lines...) Expand all Loading... |
| 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 25 */ | 25 */ |
| 26 | 26 |
| 27 #include "platform/network/ResourceRequest.h" | 27 #include "platform/network/ResourceRequest.h" |
| 28 | 28 |
| 29 #include "platform/HTTPNames.h" | 29 #include "platform/HTTPNames.h" |
| 30 #include "platform/RuntimeEnabledFeatures.h" | 30 #include "platform/RuntimeEnabledFeatures.h" |
| 31 #include "platform/network/NetworkUtils.h" | 31 #include "platform/network/NetworkUtils.h" |
| 32 #include "platform/network/ResourceResponse.h" |
| 32 #include "platform/weborigin/SecurityOrigin.h" | 33 #include "platform/weborigin/SecurityOrigin.h" |
| 33 #include "public/platform/WebAddressSpace.h" | 34 #include "public/platform/WebAddressSpace.h" |
| 34 #include "public/platform/WebCachePolicy.h" | 35 #include "public/platform/WebCachePolicy.h" |
| 35 #include "public/platform/WebURLRequest.h" | 36 #include "public/platform/WebURLRequest.h" |
| 36 #include "wtf/PtrUtil.h" | 37 #include "wtf/PtrUtil.h" |
| 37 #include <memory> | 38 #include <memory> |
| 38 | 39 |
| 39 namespace blink { | 40 namespace blink { |
| 40 | 41 |
| 41 double ResourceRequest::s_defaultTimeoutInterval = INT_MAX; | 42 double ResourceRequest::s_defaultTimeoutInterval = INT_MAX; |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 setFetchCredentialsMode(data->m_fetchCredentialsMode); | 87 setFetchCredentialsMode(data->m_fetchCredentialsMode); |
| 87 setFetchRedirectMode(data->m_fetchRedirectMode); | 88 setFetchRedirectMode(data->m_fetchRedirectMode); |
| 88 setLoFiState(data->m_loFiState); | 89 setLoFiState(data->m_loFiState); |
| 89 m_referrerPolicy = data->m_referrerPolicy; | 90 m_referrerPolicy = data->m_referrerPolicy; |
| 90 m_didSetHTTPReferrer = data->m_didSetHTTPReferrer; | 91 m_didSetHTTPReferrer = data->m_didSetHTTPReferrer; |
| 91 m_checkForBrowserSideNavigation = data->m_checkForBrowserSideNavigation; | 92 m_checkForBrowserSideNavigation = data->m_checkForBrowserSideNavigation; |
| 92 m_uiStartTime = data->m_uiStartTime; | 93 m_uiStartTime = data->m_uiStartTime; |
| 93 m_isExternalRequest = data->m_isExternalRequest; | 94 m_isExternalRequest = data->m_isExternalRequest; |
| 94 m_inputPerfMetricReportPolicy = data->m_inputPerfMetricReportPolicy; | 95 m_inputPerfMetricReportPolicy = data->m_inputPerfMetricReportPolicy; |
| 95 m_redirectStatus = data->m_redirectStatus; | 96 m_redirectStatus = data->m_redirectStatus; |
| 97 for (auto& response : data->m_responses) |
| 98 data->m_responses.emplace_back(response.get()); |
| 99 m_navigationStart = data->m_navigationStart; |
| 96 } | 100 } |
| 97 | 101 |
| 98 ResourceRequest::ResourceRequest(const ResourceRequest&) = default; | 102 ResourceRequest::ResourceRequest(const ResourceRequest&) = default; |
| 99 | 103 |
| 100 ResourceRequest& ResourceRequest::operator=(const ResourceRequest&) = default; | 104 ResourceRequest& ResourceRequest::operator=(const ResourceRequest&) = default; |
| 101 | 105 |
| 102 std::unique_ptr<CrossThreadResourceRequestData> ResourceRequest::copyData() cons
t | 106 std::unique_ptr<CrossThreadResourceRequestData> ResourceRequest::copyData() cons
t |
| 103 { | 107 { |
| 104 std::unique_ptr<CrossThreadResourceRequestData> data = wrapUnique(new CrossT
hreadResourceRequestData()); | 108 std::unique_ptr<CrossThreadResourceRequestData> data = wrapUnique(new CrossT
hreadResourceRequestData()); |
| 105 data->m_url = url().copy(); | 109 data->m_url = url().copy(); |
| (...skipping 26 matching lines...) Expand all Loading... |
| 132 data->m_fetchCredentialsMode = m_fetchCredentialsMode; | 136 data->m_fetchCredentialsMode = m_fetchCredentialsMode; |
| 133 data->m_fetchRedirectMode = m_fetchRedirectMode; | 137 data->m_fetchRedirectMode = m_fetchRedirectMode; |
| 134 data->m_loFiState = m_loFiState; | 138 data->m_loFiState = m_loFiState; |
| 135 data->m_referrerPolicy = m_referrerPolicy; | 139 data->m_referrerPolicy = m_referrerPolicy; |
| 136 data->m_didSetHTTPReferrer = m_didSetHTTPReferrer; | 140 data->m_didSetHTTPReferrer = m_didSetHTTPReferrer; |
| 137 data->m_checkForBrowserSideNavigation = m_checkForBrowserSideNavigation; | 141 data->m_checkForBrowserSideNavigation = m_checkForBrowserSideNavigation; |
| 138 data->m_uiStartTime = m_uiStartTime; | 142 data->m_uiStartTime = m_uiStartTime; |
| 139 data->m_isExternalRequest = m_isExternalRequest; | 143 data->m_isExternalRequest = m_isExternalRequest; |
| 140 data->m_inputPerfMetricReportPolicy = m_inputPerfMetricReportPolicy; | 144 data->m_inputPerfMetricReportPolicy = m_inputPerfMetricReportPolicy; |
| 141 data->m_redirectStatus = m_redirectStatus; | 145 data->m_redirectStatus = m_redirectStatus; |
| 146 for (auto& response : m_responses) |
| 147 data->m_responses.push_back(response.toResourceResponse().copyData()); |
| 148 data->m_navigationStart = m_navigationStart; |
| 142 return data; | 149 return data; |
| 143 } | 150 } |
| 144 | 151 |
| 145 bool ResourceRequest::isEmpty() const | 152 bool ResourceRequest::isEmpty() const |
| 146 { | 153 { |
| 147 return m_url.isEmpty(); | 154 return m_url.isEmpty(); |
| 148 } | 155 } |
| 149 | 156 |
| 150 bool ResourceRequest::isNull() const | 157 bool ResourceRequest::isNull() const |
| 151 { | 158 { |
| 152 return m_url.isNull(); | 159 return m_url.isNull(); |
| 153 } | 160 } |
| 154 | 161 |
| 155 const KURL& ResourceRequest::url() const | 162 const KURL& ResourceRequest::url() const |
| 156 { | 163 { |
| 157 return m_url; | 164 return m_url; |
| 158 } | 165 } |
| 159 | 166 |
| 160 void ResourceRequest::setURL(const KURL& url) | 167 void ResourceRequest::setURL(const KURL& url) |
| 161 { | 168 { |
| 162 m_url = url; | 169 m_url = url; |
| 163 } | 170 } |
| 164 | 171 |
| 172 const KURL& ResourceRequest::initialUrl() const |
| 173 { |
| 174 return m_responses.empty() ? url() : m_responses[0].toResourceResponse().url
(); |
| 175 } |
| 176 |
| 165 void ResourceRequest::removeCredentials() | 177 void ResourceRequest::removeCredentials() |
| 166 { | 178 { |
| 167 if (m_url.user().isEmpty() && m_url.pass().isEmpty()) | 179 if (m_url.user().isEmpty() && m_url.pass().isEmpty()) |
| 168 return; | 180 return; |
| 169 | 181 |
| 170 m_url.setUser(String()); | 182 m_url.setUser(String()); |
| 171 m_url.setPass(String()); | 183 m_url.setPass(String()); |
| 172 } | 184 } |
| 173 | 185 |
| 174 WebCachePolicy ResourceRequest::getCachePolicy() const | 186 WebCachePolicy ResourceRequest::getCachePolicy() const |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 373 | 385 |
| 374 WebAddressSpace targetSpace = WebAddressSpacePublic; | 386 WebAddressSpace targetSpace = WebAddressSpacePublic; |
| 375 if (NetworkUtils::isReservedIPAddress(m_url.host())) | 387 if (NetworkUtils::isReservedIPAddress(m_url.host())) |
| 376 targetSpace = WebAddressSpacePrivate; | 388 targetSpace = WebAddressSpacePrivate; |
| 377 if (SecurityOrigin::create(m_url)->isLocalhost()) | 389 if (SecurityOrigin::create(m_url)->isLocalhost()) |
| 378 targetSpace = WebAddressSpaceLocal; | 390 targetSpace = WebAddressSpaceLocal; |
| 379 | 391 |
| 380 m_isExternalRequest = requestorSpace > targetSpace; | 392 m_isExternalRequest = requestorSpace > targetSpace; |
| 381 } | 393 } |
| 382 | 394 |
| 395 void ResourceRequest::appendPreviousResponse(const WebURLResponse& response) |
| 396 { |
| 397 m_responses.push_back(response); |
| 398 } |
| 399 |
| 400 void ResourceRequest::setPreviousNavigationStart(double navigationStart) |
| 401 { |
| 402 m_navigationStart = navigationStart; |
| 403 } |
| 404 |
| 383 bool ResourceRequest::isConditional() const | 405 bool ResourceRequest::isConditional() const |
| 384 { | 406 { |
| 385 return (m_httpHeaderFields.contains(HTTPNames::If_Match) | 407 return (m_httpHeaderFields.contains(HTTPNames::If_Match) |
| 386 || m_httpHeaderFields.contains(HTTPNames::If_Modified_Since) | 408 || m_httpHeaderFields.contains(HTTPNames::If_Modified_Since) |
| 387 || m_httpHeaderFields.contains(HTTPNames::If_None_Match) | 409 || m_httpHeaderFields.contains(HTTPNames::If_None_Match) |
| 388 || m_httpHeaderFields.contains(HTTPNames::If_Range) | 410 || m_httpHeaderFields.contains(HTTPNames::If_Range) |
| 389 || m_httpHeaderFields.contains(HTTPNames::If_Unmodified_Since)); | 411 || m_httpHeaderFields.contains(HTTPNames::If_Unmodified_Since)); |
| 390 } | 412 } |
| 391 | 413 |
| 392 void ResourceRequest::setHasUserGesture(bool hasUserGesture) | 414 void ResourceRequest::setHasUserGesture(bool hasUserGesture) |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 445 m_didSetHTTPReferrer = false; | 467 m_didSetHTTPReferrer = false; |
| 446 m_checkForBrowserSideNavigation = true; | 468 m_checkForBrowserSideNavigation = true; |
| 447 m_uiStartTime = 0; | 469 m_uiStartTime = 0; |
| 448 m_isExternalRequest = false; | 470 m_isExternalRequest = false; |
| 449 m_inputPerfMetricReportPolicy = InputToLoadPerfMetricReportPolicy::NoReport; | 471 m_inputPerfMetricReportPolicy = InputToLoadPerfMetricReportPolicy::NoReport; |
| 450 m_redirectStatus = RedirectStatus::NoRedirect; | 472 m_redirectStatus = RedirectStatus::NoRedirect; |
| 451 m_requestorOrigin = SecurityOrigin::createUnique(); | 473 m_requestorOrigin = SecurityOrigin::createUnique(); |
| 452 } | 474 } |
| 453 | 475 |
| 454 } // namespace blink | 476 } // namespace blink |
| OLD | NEW |