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

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

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 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 15 matching lines...) Expand all
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/weborigin/SecurityOrigin.h" 32 #include "platform/weborigin/SecurityOrigin.h"
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"
37 #include <memory>
36 38
37 namespace blink { 39 namespace blink {
38 40
39 double ResourceRequest::s_defaultTimeoutInterval = INT_MAX; 41 double ResourceRequest::s_defaultTimeoutInterval = INT_MAX;
40 42
41 ResourceRequest::ResourceRequest(CrossThreadResourceRequestData* data) 43 ResourceRequest::ResourceRequest(CrossThreadResourceRequestData* data)
42 : ResourceRequest() 44 : ResourceRequest()
43 { 45 {
44 setURL(data->m_url); 46 setURL(data->m_url);
45 setCachePolicy(data->m_cachePolicy); 47 setCachePolicy(data->m_cachePolicy);
(...skipping 25 matching lines...) Expand all
71 setLoFiState(data->m_loFiState); 73 setLoFiState(data->m_loFiState);
72 m_referrerPolicy = data->m_referrerPolicy; 74 m_referrerPolicy = data->m_referrerPolicy;
73 m_didSetHTTPReferrer = data->m_didSetHTTPReferrer; 75 m_didSetHTTPReferrer = data->m_didSetHTTPReferrer;
74 m_checkForBrowserSideNavigation = data->m_checkForBrowserSideNavigation; 76 m_checkForBrowserSideNavigation = data->m_checkForBrowserSideNavigation;
75 m_uiStartTime = data->m_uiStartTime; 77 m_uiStartTime = data->m_uiStartTime;
76 m_isExternalRequest = data->m_isExternalRequest; 78 m_isExternalRequest = data->m_isExternalRequest;
77 m_inputPerfMetricReportPolicy = data->m_inputPerfMetricReportPolicy; 79 m_inputPerfMetricReportPolicy = data->m_inputPerfMetricReportPolicy;
78 m_redirectStatus = data->m_redirectStatus; 80 m_redirectStatus = data->m_redirectStatus;
79 } 81 }
80 82
81 PassOwnPtr<CrossThreadResourceRequestData> ResourceRequest::copyData() const 83 std::unique_ptr<CrossThreadResourceRequestData> ResourceRequest::copyData() cons t
82 { 84 {
83 OwnPtr<CrossThreadResourceRequestData> data = adoptPtr(new CrossThreadResour ceRequestData()); 85 std::unique_ptr<CrossThreadResourceRequestData> data = wrapUnique(new CrossT hreadResourceRequestData());
84 data->m_url = url().copy(); 86 data->m_url = url().copy();
85 data->m_cachePolicy = getCachePolicy(); 87 data->m_cachePolicy = getCachePolicy();
86 data->m_timeoutInterval = timeoutInterval(); 88 data->m_timeoutInterval = timeoutInterval();
87 data->m_firstPartyForCookies = firstPartyForCookies().copy(); 89 data->m_firstPartyForCookies = firstPartyForCookies().copy();
88 data->m_requestorOrigin = requestorOrigin() ? requestorOrigin()->isolatedCop y() : nullptr; 90 data->m_requestorOrigin = requestorOrigin() ? requestorOrigin()->isolatedCop y() : nullptr;
89 data->m_httpMethod = httpMethod().getString().isolatedCopy(); 91 data->m_httpMethod = httpMethod().getString().isolatedCopy();
90 data->m_httpHeaders = httpHeaderFields().copyData(); 92 data->m_httpHeaders = httpHeaderFields().copyData();
91 data->m_priority = priority(); 93 data->m_priority = priority();
92 data->m_intraPriorityValue = m_intraPriorityValue; 94 data->m_intraPriorityValue = m_intraPriorityValue;
93 95
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 m_didSetHTTPReferrer = false; 426 m_didSetHTTPReferrer = false;
425 m_checkForBrowserSideNavigation = true; 427 m_checkForBrowserSideNavigation = true;
426 m_uiStartTime = 0; 428 m_uiStartTime = 0;
427 m_isExternalRequest = false; 429 m_isExternalRequest = false;
428 m_inputPerfMetricReportPolicy = InputToLoadPerfMetricReportPolicy::NoReport; 430 m_inputPerfMetricReportPolicy = InputToLoadPerfMetricReportPolicy::NoReport;
429 m_redirectStatus = RedirectStatus::NoRedirect; 431 m_redirectStatus = RedirectStatus::NoRedirect;
430 m_requestorOrigin = SecurityOrigin::createUnique(); 432 m_requestorOrigin = SecurityOrigin::createUnique();
431 } 433 }
432 434
433 } // namespace blink 435 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698