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

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

Issue 360233005: Replace 'ResourceRequest::TargetType' with 'ResourceRequest::RequestContext'. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Uninitialized === crash. :( Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/platform/network/ResourceRequest.h ('k') | Source/web/WebEmbeddedWorkerImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
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 "config.h" 27 #include "config.h"
28 #include "platform/network/ResourceRequest.h" 28 #include "platform/network/ResourceRequest.h"
29 #include "platform/weborigin/SecurityOrigin.h" 29 #include "platform/weborigin/SecurityOrigin.h"
30 #include "public/platform/WebURLRequest.h"
30 31
31 namespace WebCore { 32 namespace WebCore {
32 33
33 double ResourceRequest::s_defaultTimeoutInterval = INT_MAX; 34 double ResourceRequest::s_defaultTimeoutInterval = INT_MAX;
34 35
35 PassOwnPtr<ResourceRequest> ResourceRequest::adopt(PassOwnPtr<CrossThreadResourc eRequestData> data) 36 PassOwnPtr<ResourceRequest> ResourceRequest::adopt(PassOwnPtr<CrossThreadResourc eRequestData> data)
36 { 37 {
37 OwnPtr<ResourceRequest> request = adoptPtr(new ResourceRequest()); 38 OwnPtr<ResourceRequest> request = adoptPtr(new ResourceRequest());
38 request->setURL(data->m_url); 39 request->setURL(data->m_url);
39 request->setCachePolicy(data->m_cachePolicy); 40 request->setCachePolicy(data->m_cachePolicy);
40 request->setTimeoutInterval(data->m_timeoutInterval); 41 request->setTimeoutInterval(data->m_timeoutInterval);
41 request->setFirstPartyForCookies(data->m_firstPartyForCookies); 42 request->setFirstPartyForCookies(data->m_firstPartyForCookies);
42 request->setHTTPMethod(AtomicString(data->m_httpMethod)); 43 request->setHTTPMethod(AtomicString(data->m_httpMethod));
43 request->setPriority(data->m_priority, data->m_intraPriorityValue); 44 request->setPriority(data->m_priority, data->m_intraPriorityValue);
44 45
45 request->m_httpHeaderFields.adopt(data->m_httpHeaders.release()); 46 request->m_httpHeaderFields.adopt(data->m_httpHeaders.release());
46 47
47 request->setHTTPBody(data->m_httpBody); 48 request->setHTTPBody(data->m_httpBody);
48 request->setAllowStoredCredentials(data->m_allowStoredCredentials); 49 request->setAllowStoredCredentials(data->m_allowStoredCredentials);
49 request->setReportUploadProgress(data->m_reportUploadProgress); 50 request->setReportUploadProgress(data->m_reportUploadProgress);
50 request->setHasUserGesture(data->m_hasUserGesture); 51 request->setHasUserGesture(data->m_hasUserGesture);
51 request->setDownloadToFile(data->m_downloadToFile); 52 request->setDownloadToFile(data->m_downloadToFile);
52 request->setRequestorID(data->m_requestorID); 53 request->setRequestorID(data->m_requestorID);
53 request->setRequestorProcessID(data->m_requestorProcessID); 54 request->setRequestorProcessID(data->m_requestorProcessID);
54 request->setAppCacheHostID(data->m_appCacheHostID); 55 request->setAppCacheHostID(data->m_appCacheHostID);
55 request->setTargetType(data->m_targetType); 56 request->setRequestContext(data->m_requestContext);
56 request->m_referrerPolicy = data->m_referrerPolicy; 57 request->m_referrerPolicy = data->m_referrerPolicy;
57 return request.release(); 58 return request.release();
58 } 59 }
59 60
60 PassOwnPtr<CrossThreadResourceRequestData> ResourceRequest::copyData() const 61 PassOwnPtr<CrossThreadResourceRequestData> ResourceRequest::copyData() const
61 { 62 {
62 OwnPtr<CrossThreadResourceRequestData> data = adoptPtr(new CrossThreadResour ceRequestData()); 63 OwnPtr<CrossThreadResourceRequestData> data = adoptPtr(new CrossThreadResour ceRequestData());
63 data->m_url = url().copy(); 64 data->m_url = url().copy();
64 data->m_cachePolicy = cachePolicy(); 65 data->m_cachePolicy = cachePolicy();
65 data->m_timeoutInterval = timeoutInterval(); 66 data->m_timeoutInterval = timeoutInterval();
66 data->m_firstPartyForCookies = firstPartyForCookies().copy(); 67 data->m_firstPartyForCookies = firstPartyForCookies().copy();
67 data->m_httpMethod = httpMethod().string().isolatedCopy(); 68 data->m_httpMethod = httpMethod().string().isolatedCopy();
68 data->m_httpHeaders = httpHeaderFields().copyData(); 69 data->m_httpHeaders = httpHeaderFields().copyData();
69 data->m_priority = priority(); 70 data->m_priority = priority();
70 data->m_intraPriorityValue = m_intraPriorityValue; 71 data->m_intraPriorityValue = m_intraPriorityValue;
71 72
72 if (m_httpBody) 73 if (m_httpBody)
73 data->m_httpBody = m_httpBody->deepCopy(); 74 data->m_httpBody = m_httpBody->deepCopy();
74 data->m_allowStoredCredentials = m_allowStoredCredentials; 75 data->m_allowStoredCredentials = m_allowStoredCredentials;
75 data->m_reportUploadProgress = m_reportUploadProgress; 76 data->m_reportUploadProgress = m_reportUploadProgress;
76 data->m_hasUserGesture = m_hasUserGesture; 77 data->m_hasUserGesture = m_hasUserGesture;
77 data->m_downloadToFile = m_downloadToFile; 78 data->m_downloadToFile = m_downloadToFile;
78 data->m_requestorID = m_requestorID; 79 data->m_requestorID = m_requestorID;
79 data->m_requestorProcessID = m_requestorProcessID; 80 data->m_requestorProcessID = m_requestorProcessID;
80 data->m_appCacheHostID = m_appCacheHostID; 81 data->m_appCacheHostID = m_appCacheHostID;
81 data->m_targetType = m_targetType; 82 data->m_requestContext = m_requestContext;
82 data->m_referrerPolicy = m_referrerPolicy; 83 data->m_referrerPolicy = m_referrerPolicy;
83 return data.release(); 84 return data.release();
84 } 85 }
85 86
86 bool ResourceRequest::isEmpty() const 87 bool ResourceRequest::isEmpty() const
87 { 88 {
88 return m_url.isEmpty(); 89 return m_url.isEmpty();
89 } 90 }
90 91
91 bool ResourceRequest::isNull() const 92 bool ResourceRequest::isNull() const
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 m_allowStoredCredentials = true; 391 m_allowStoredCredentials = true;
391 m_reportUploadProgress = false; 392 m_reportUploadProgress = false;
392 m_reportRawHeaders = false; 393 m_reportRawHeaders = false;
393 m_hasUserGesture = false; 394 m_hasUserGesture = false;
394 m_downloadToFile = false; 395 m_downloadToFile = false;
395 m_priority = ResourceLoadPriorityLow; 396 m_priority = ResourceLoadPriorityLow;
396 m_intraPriorityValue = 0; 397 m_intraPriorityValue = 0;
397 m_requestorID = 0; 398 m_requestorID = 0;
398 m_requestorProcessID = 0; 399 m_requestorProcessID = 0;
399 m_appCacheHostID = 0; 400 m_appCacheHostID = 0;
400 m_targetType = TargetIsUnspecified; 401 m_requestContext = blink::WebURLRequest::RequestContextUnspecified;
401 m_referrerPolicy = ReferrerPolicyDefault; 402 m_referrerPolicy = ReferrerPolicyDefault;
402 } 403 }
403 404
404 // This is used by the loader to control the number of issued parallel load requ ests. 405 // This is used by the loader to control the number of issued parallel load requ ests.
405 unsigned initializeMaximumHTTPConnectionCountPerHost() 406 unsigned initializeMaximumHTTPConnectionCountPerHost()
406 { 407 {
407 // The chromium network stack already handles limiting the number of 408 // The chromium network stack already handles limiting the number of
408 // parallel requests per host, so there's no need to do it here. Therefore, 409 // parallel requests per host, so there's no need to do it here. Therefore,
409 // this is set to a high value that should never be hit in practice. 410 // this is set to a high value that should never be hit in practice.
410 return 10000; 411 return 10000;
411 } 412 }
412 413
413 } 414 }
OLDNEW
« no previous file with comments | « Source/platform/network/ResourceRequest.h ('k') | Source/web/WebEmbeddedWorkerImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698