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

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

Issue 2714423002: Rename SkipServiceWorker to ServiceWorkerMode (Closed)
Patch Set: typos-- Created 3 years, 9 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 m_timeoutInterval(s_defaultTimeoutInterval), 51 m_timeoutInterval(s_defaultTimeoutInterval),
52 m_requestorOrigin(SecurityOrigin::createUnique()), 52 m_requestorOrigin(SecurityOrigin::createUnique()),
53 m_httpMethod(HTTPNames::GET), 53 m_httpMethod(HTTPNames::GET),
54 m_allowStoredCredentials(true), 54 m_allowStoredCredentials(true),
55 m_reportUploadProgress(false), 55 m_reportUploadProgress(false),
56 m_reportRawHeaders(false), 56 m_reportRawHeaders(false),
57 m_hasUserGesture(false), 57 m_hasUserGesture(false),
58 m_downloadToFile(false), 58 m_downloadToFile(false),
59 m_useStreamOnResponse(false), 59 m_useStreamOnResponse(false),
60 m_shouldResetAppCache(false), 60 m_shouldResetAppCache(false),
61 m_skipServiceWorker(WebURLRequest::SkipServiceWorker::None), 61 m_serviceWorkerMode(WebURLRequest::ServiceWorkerMode::All),
62 m_priority(ResourceLoadPriorityLowest), 62 m_priority(ResourceLoadPriorityLowest),
63 m_intraPriorityValue(0), 63 m_intraPriorityValue(0),
64 m_requestorID(0), 64 m_requestorID(0),
65 m_requestorProcessID(0), 65 m_requestorProcessID(0),
66 m_appCacheHostID(0), 66 m_appCacheHostID(0),
67 m_requestContext(WebURLRequest::RequestContextUnspecified), 67 m_requestContext(WebURLRequest::RequestContextUnspecified),
68 m_frameType(WebURLRequest::FrameTypeNone), 68 m_frameType(WebURLRequest::FrameTypeNone),
69 m_fetchRequestMode(WebURLRequest::FetchRequestModeNoCORS), 69 m_fetchRequestMode(WebURLRequest::FetchRequestModeNoCORS),
70 m_fetchCredentialsMode(WebURLRequest::FetchCredentialsModeInclude), 70 m_fetchCredentialsMode(WebURLRequest::FetchCredentialsModeInclude),
71 m_fetchRedirectMode(WebURLRequest::FetchRedirectModeFollow), 71 m_fetchRedirectMode(WebURLRequest::FetchRedirectModeFollow),
(...skipping 19 matching lines...) Expand all
91 91
92 m_httpHeaderFields.adopt(std::move(data->m_httpHeaders)); 92 m_httpHeaderFields.adopt(std::move(data->m_httpHeaders));
93 93
94 setHTTPBody(data->m_httpBody); 94 setHTTPBody(data->m_httpBody);
95 setAttachedCredential(data->m_attachedCredential); 95 setAttachedCredential(data->m_attachedCredential);
96 setAllowStoredCredentials(data->m_allowStoredCredentials); 96 setAllowStoredCredentials(data->m_allowStoredCredentials);
97 setReportUploadProgress(data->m_reportUploadProgress); 97 setReportUploadProgress(data->m_reportUploadProgress);
98 setHasUserGesture(data->m_hasUserGesture); 98 setHasUserGesture(data->m_hasUserGesture);
99 setDownloadToFile(data->m_downloadToFile); 99 setDownloadToFile(data->m_downloadToFile);
100 setUseStreamOnResponse(data->m_useStreamOnResponse); 100 setUseStreamOnResponse(data->m_useStreamOnResponse);
101 setSkipServiceWorker(data->m_skipServiceWorker); 101 setServiceWorkerMode(data->m_serviceWorkerMode);
102 setShouldResetAppCache(data->m_shouldResetAppCache); 102 setShouldResetAppCache(data->m_shouldResetAppCache);
103 setRequestorID(data->m_requestorID); 103 setRequestorID(data->m_requestorID);
104 setRequestorProcessID(data->m_requestorProcessID); 104 setRequestorProcessID(data->m_requestorProcessID);
105 setAppCacheHostID(data->m_appCacheHostID); 105 setAppCacheHostID(data->m_appCacheHostID);
106 setRequestContext(data->m_requestContext); 106 setRequestContext(data->m_requestContext);
107 setFrameType(data->m_frameType); 107 setFrameType(data->m_frameType);
108 setFetchRequestMode(data->m_fetchRequestMode); 108 setFetchRequestMode(data->m_fetchRequestMode);
109 setFetchCredentialsMode(data->m_fetchCredentialsMode); 109 setFetchCredentialsMode(data->m_fetchCredentialsMode);
110 setFetchRedirectMode(data->m_fetchRedirectMode); 110 setFetchRedirectMode(data->m_fetchRedirectMode);
111 setPreviewsState(data->m_previewsState); 111 setPreviewsState(data->m_previewsState);
(...skipping 27 matching lines...) Expand all
139 139
140 if (m_httpBody) 140 if (m_httpBody)
141 data->m_httpBody = m_httpBody->deepCopy(); 141 data->m_httpBody = m_httpBody->deepCopy();
142 if (m_attachedCredential) 142 if (m_attachedCredential)
143 data->m_attachedCredential = m_attachedCredential->deepCopy(); 143 data->m_attachedCredential = m_attachedCredential->deepCopy();
144 data->m_allowStoredCredentials = m_allowStoredCredentials; 144 data->m_allowStoredCredentials = m_allowStoredCredentials;
145 data->m_reportUploadProgress = m_reportUploadProgress; 145 data->m_reportUploadProgress = m_reportUploadProgress;
146 data->m_hasUserGesture = m_hasUserGesture; 146 data->m_hasUserGesture = m_hasUserGesture;
147 data->m_downloadToFile = m_downloadToFile; 147 data->m_downloadToFile = m_downloadToFile;
148 data->m_useStreamOnResponse = m_useStreamOnResponse; 148 data->m_useStreamOnResponse = m_useStreamOnResponse;
149 data->m_skipServiceWorker = m_skipServiceWorker; 149 data->m_serviceWorkerMode = m_serviceWorkerMode;
150 data->m_shouldResetAppCache = m_shouldResetAppCache; 150 data->m_shouldResetAppCache = m_shouldResetAppCache;
151 data->m_requestorID = m_requestorID; 151 data->m_requestorID = m_requestorID;
152 data->m_requestorProcessID = m_requestorProcessID; 152 data->m_requestorProcessID = m_requestorProcessID;
153 data->m_appCacheHostID = m_appCacheHostID; 153 data->m_appCacheHostID = m_appCacheHostID;
154 data->m_requestContext = m_requestContext; 154 data->m_requestContext = m_requestContext;
155 data->m_frameType = m_frameType; 155 data->m_frameType = m_frameType;
156 data->m_fetchRequestMode = m_fetchRequestMode; 156 data->m_fetchRequestMode = m_fetchRequestMode;
157 data->m_fetchCredentialsMode = m_fetchCredentialsMode; 157 data->m_fetchCredentialsMode = m_fetchCredentialsMode;
158 data->m_fetchRedirectMode = m_fetchRedirectMode; 158 data->m_fetchRedirectMode = m_fetchRedirectMode;
159 data->m_previewsState = m_previewsState; 159 data->m_previewsState = m_previewsState;
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 // layer. 416 // layer.
417 if (httpMethod() == HTTPNames::GET || httpMethod() == HTTPNames::HEAD) 417 if (httpMethod() == HTTPNames::GET || httpMethod() == HTTPNames::HEAD)
418 return false; 418 return false;
419 419
420 // For non-GET and non-HEAD methods, always send an Origin header so the 420 // For non-GET and non-HEAD methods, always send an Origin header so the
421 // server knows we support this feature. 421 // server knows we support this feature.
422 return true; 422 return true;
423 } 423 }
424 424
425 } // namespace blink 425 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698