Chromium Code Reviews| 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 22 matching lines...) Expand all Loading... | |
| 33 #include "public/platform/WebAddressSpace.h" | 33 #include "public/platform/WebAddressSpace.h" |
| 34 #include "public/platform/WebCachePolicy.h" | 34 #include "public/platform/WebCachePolicy.h" |
| 35 #include "public/platform/WebURLRequest.h" | 35 #include "public/platform/WebURLRequest.h" |
| 36 #include "wtf/PtrUtil.h" | 36 #include "wtf/PtrUtil.h" |
| 37 #include <memory> | 37 #include <memory> |
| 38 | 38 |
| 39 namespace blink { | 39 namespace blink { |
| 40 | 40 |
| 41 double ResourceRequest::s_defaultTimeoutInterval = INT_MAX; | 41 double ResourceRequest::s_defaultTimeoutInterval = INT_MAX; |
| 42 | 42 |
| 43 ResourceRequest::ResourceRequest() | |
| 44 { | |
| 45 initialize(KURL()); | |
|
dcheng
2016/07/12 07:45:18
I forgot to include this line when moving the code
| |
| 46 } | |
| 47 | |
| 48 ResourceRequest::ResourceRequest(const String& urlString) | |
| 49 { | |
| 50 initialize(KURL(ParsedURLString, urlString)); | |
| 51 } | |
| 52 | |
| 53 ResourceRequest::ResourceRequest(const KURL& url) | |
| 54 { | |
| 55 initialize(url); | |
| 56 } | |
| 57 | |
| 43 ResourceRequest::ResourceRequest(CrossThreadResourceRequestData* data) | 58 ResourceRequest::ResourceRequest(CrossThreadResourceRequestData* data) |
| 44 : ResourceRequest() | 59 : ResourceRequest() |
| 45 { | 60 { |
| 46 setURL(data->m_url); | 61 setURL(data->m_url); |
| 47 setCachePolicy(data->m_cachePolicy); | 62 setCachePolicy(data->m_cachePolicy); |
| 48 setTimeoutInterval(data->m_timeoutInterval); | 63 setTimeoutInterval(data->m_timeoutInterval); |
| 49 setFirstPartyForCookies(data->m_firstPartyForCookies); | 64 setFirstPartyForCookies(data->m_firstPartyForCookies); |
| 50 setRequestorOrigin(data->m_requestorOrigin); | 65 setRequestorOrigin(data->m_requestorOrigin); |
| 51 setHTTPMethod(AtomicString(data->m_httpMethod)); | 66 setHTTPMethod(AtomicString(data->m_httpMethod)); |
| 52 setPriority(data->m_priority, data->m_intraPriorityValue); | 67 setPriority(data->m_priority, data->m_intraPriorityValue); |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 73 setLoFiState(data->m_loFiState); | 88 setLoFiState(data->m_loFiState); |
| 74 m_referrerPolicy = data->m_referrerPolicy; | 89 m_referrerPolicy = data->m_referrerPolicy; |
| 75 m_didSetHTTPReferrer = data->m_didSetHTTPReferrer; | 90 m_didSetHTTPReferrer = data->m_didSetHTTPReferrer; |
| 76 m_checkForBrowserSideNavigation = data->m_checkForBrowserSideNavigation; | 91 m_checkForBrowserSideNavigation = data->m_checkForBrowserSideNavigation; |
| 77 m_uiStartTime = data->m_uiStartTime; | 92 m_uiStartTime = data->m_uiStartTime; |
| 78 m_isExternalRequest = data->m_isExternalRequest; | 93 m_isExternalRequest = data->m_isExternalRequest; |
| 79 m_inputPerfMetricReportPolicy = data->m_inputPerfMetricReportPolicy; | 94 m_inputPerfMetricReportPolicy = data->m_inputPerfMetricReportPolicy; |
| 80 m_redirectStatus = data->m_redirectStatus; | 95 m_redirectStatus = data->m_redirectStatus; |
| 81 } | 96 } |
| 82 | 97 |
| 98 ResourceRequest::ResourceRequest(const ResourceRequest&) = default; | |
| 99 | |
| 100 ResourceRequest& ResourceRequest::operator=(const ResourceRequest&) = default; | |
| 101 | |
| 83 std::unique_ptr<CrossThreadResourceRequestData> ResourceRequest::copyData() cons t | 102 std::unique_ptr<CrossThreadResourceRequestData> ResourceRequest::copyData() cons t |
| 84 { | 103 { |
| 85 std::unique_ptr<CrossThreadResourceRequestData> data = wrapUnique(new CrossT hreadResourceRequestData()); | 104 std::unique_ptr<CrossThreadResourceRequestData> data = wrapUnique(new CrossT hreadResourceRequestData()); |
| 86 data->m_url = url().copy(); | 105 data->m_url = url().copy(); |
| 87 data->m_cachePolicy = getCachePolicy(); | 106 data->m_cachePolicy = getCachePolicy(); |
| 88 data->m_timeoutInterval = timeoutInterval(); | 107 data->m_timeoutInterval = timeoutInterval(); |
| 89 data->m_firstPartyForCookies = firstPartyForCookies().copy(); | 108 data->m_firstPartyForCookies = firstPartyForCookies().copy(); |
| 90 data->m_requestorOrigin = requestorOrigin() ? requestorOrigin()->isolatedCop y() : nullptr; | 109 data->m_requestorOrigin = requestorOrigin() ? requestorOrigin()->isolatedCop y() : nullptr; |
| 91 data->m_httpMethod = httpMethod().getString().isolatedCopy(); | 110 data->m_httpMethod = httpMethod().getString().isolatedCopy(); |
| 92 data->m_httpHeaders = httpHeaderFields().copyData(); | 111 data->m_httpHeaders = httpHeaderFields().copyData(); |
| (...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 426 m_didSetHTTPReferrer = false; | 445 m_didSetHTTPReferrer = false; |
| 427 m_checkForBrowserSideNavigation = true; | 446 m_checkForBrowserSideNavigation = true; |
| 428 m_uiStartTime = 0; | 447 m_uiStartTime = 0; |
| 429 m_isExternalRequest = false; | 448 m_isExternalRequest = false; |
| 430 m_inputPerfMetricReportPolicy = InputToLoadPerfMetricReportPolicy::NoReport; | 449 m_inputPerfMetricReportPolicy = InputToLoadPerfMetricReportPolicy::NoReport; |
| 431 m_redirectStatus = RedirectStatus::NoRedirect; | 450 m_redirectStatus = RedirectStatus::NoRedirect; |
| 432 m_requestorOrigin = SecurityOrigin::createUnique(); | 451 m_requestorOrigin = SecurityOrigin::createUnique(); |
| 433 } | 452 } |
| 434 | 453 |
| 435 } // namespace blink | 454 } // namespace blink |
| OLD | NEW |