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

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

Issue 2254693002: Delay generation of User-Agent header to URLRequestHttpJob and accept custom User-Agent from XHR/Fe… Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changed Android test Created 4 years, 4 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 setURL(data->m_url); 61 setURL(data->m_url);
62 setCachePolicy(data->m_cachePolicy); 62 setCachePolicy(data->m_cachePolicy);
63 setTimeoutInterval(data->m_timeoutInterval); 63 setTimeoutInterval(data->m_timeoutInterval);
64 setFirstPartyForCookies(data->m_firstPartyForCookies); 64 setFirstPartyForCookies(data->m_firstPartyForCookies);
65 setRequestorOrigin(data->m_requestorOrigin); 65 setRequestorOrigin(data->m_requestorOrigin);
66 setHTTPMethod(AtomicString(data->m_httpMethod)); 66 setHTTPMethod(AtomicString(data->m_httpMethod));
67 setPriority(data->m_priority, data->m_intraPriorityValue); 67 setPriority(data->m_priority, data->m_intraPriorityValue);
68 68
69 m_httpHeaderFields.adopt(std::move(data->m_httpHeaders)); 69 m_httpHeaderFields.adopt(std::move(data->m_httpHeaders));
70 70
71 setDefaultHTTPUserAgent(AtomicString(data->m_defaultHTTPUserAgent));
71 setHTTPBody(data->m_httpBody); 72 setHTTPBody(data->m_httpBody);
72 setAttachedCredential(data->m_attachedCredential); 73 setAttachedCredential(data->m_attachedCredential);
73 setAllowStoredCredentials(data->m_allowStoredCredentials); 74 setAllowStoredCredentials(data->m_allowStoredCredentials);
74 setReportUploadProgress(data->m_reportUploadProgress); 75 setReportUploadProgress(data->m_reportUploadProgress);
75 setHasUserGesture(data->m_hasUserGesture); 76 setHasUserGesture(data->m_hasUserGesture);
76 setDownloadToFile(data->m_downloadToFile); 77 setDownloadToFile(data->m_downloadToFile);
77 setUseStreamOnResponse(data->m_useStreamOnResponse); 78 setUseStreamOnResponse(data->m_useStreamOnResponse);
78 setSkipServiceWorker(data->m_skipServiceWorker); 79 setSkipServiceWorker(data->m_skipServiceWorker);
79 setShouldResetAppCache(data->m_shouldResetAppCache); 80 setShouldResetAppCache(data->m_shouldResetAppCache);
80 setRequestorID(data->m_requestorID); 81 setRequestorID(data->m_requestorID);
(...skipping 21 matching lines...) Expand all
102 std::unique_ptr<CrossThreadResourceRequestData> ResourceRequest::copyData() cons t 103 std::unique_ptr<CrossThreadResourceRequestData> ResourceRequest::copyData() cons t
103 { 104 {
104 std::unique_ptr<CrossThreadResourceRequestData> data = wrapUnique(new CrossT hreadResourceRequestData()); 105 std::unique_ptr<CrossThreadResourceRequestData> data = wrapUnique(new CrossT hreadResourceRequestData());
105 data->m_url = url().copy(); 106 data->m_url = url().copy();
106 data->m_cachePolicy = getCachePolicy(); 107 data->m_cachePolicy = getCachePolicy();
107 data->m_timeoutInterval = timeoutInterval(); 108 data->m_timeoutInterval = timeoutInterval();
108 data->m_firstPartyForCookies = firstPartyForCookies().copy(); 109 data->m_firstPartyForCookies = firstPartyForCookies().copy();
109 data->m_requestorOrigin = requestorOrigin() ? requestorOrigin()->isolatedCop y() : nullptr; 110 data->m_requestorOrigin = requestorOrigin() ? requestorOrigin()->isolatedCop y() : nullptr;
110 data->m_httpMethod = httpMethod().getString().isolatedCopy(); 111 data->m_httpMethod = httpMethod().getString().isolatedCopy();
111 data->m_httpHeaders = httpHeaderFields().copyData(); 112 data->m_httpHeaders = httpHeaderFields().copyData();
113 data->m_defaultHTTPUserAgent = defaultHTTPUserAgent().getString().isolatedCo py();
112 data->m_priority = priority(); 114 data->m_priority = priority();
113 data->m_intraPriorityValue = m_intraPriorityValue; 115 data->m_intraPriorityValue = m_intraPriorityValue;
114 116
115 if (m_httpBody) 117 if (m_httpBody)
116 data->m_httpBody = m_httpBody->deepCopy(); 118 data->m_httpBody = m_httpBody->deepCopy();
117 if (m_attachedCredential) 119 if (m_attachedCredential)
118 data->m_attachedCredential = m_attachedCredential->deepCopy(); 120 data->m_attachedCredential = m_attachedCredential->deepCopy();
119 data->m_allowStoredCredentials = m_allowStoredCredentials; 121 data->m_allowStoredCredentials = m_allowStoredCredentials;
120 data->m_reportUploadProgress = m_reportUploadProgress; 122 data->m_reportUploadProgress = m_reportUploadProgress;
121 data->m_hasUserGesture = m_hasUserGesture; 123 data->m_hasUserGesture = m_hasUserGesture;
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 m_didSetHTTPReferrer = false; 447 m_didSetHTTPReferrer = false;
446 m_checkForBrowserSideNavigation = true; 448 m_checkForBrowserSideNavigation = true;
447 m_uiStartTime = 0; 449 m_uiStartTime = 0;
448 m_isExternalRequest = false; 450 m_isExternalRequest = false;
449 m_inputPerfMetricReportPolicy = InputToLoadPerfMetricReportPolicy::NoReport; 451 m_inputPerfMetricReportPolicy = InputToLoadPerfMetricReportPolicy::NoReport;
450 m_redirectStatus = RedirectStatus::NoRedirect; 452 m_redirectStatus = RedirectStatus::NoRedirect;
451 m_requestorOrigin = SecurityOrigin::createUnique(); 453 m_requestorOrigin = SecurityOrigin::createUnique();
452 } 454 }
453 455
454 } // namespace blink 456 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698