| Index: Source/platform/network/ResourceRequest.cpp
|
| diff --git a/Source/platform/network/ResourceRequest.cpp b/Source/platform/network/ResourceRequest.cpp
|
| index d9a2be5f195e8b3e0c3929f1414692bd1f8087bc..1a7419a1ef45fec8713101ba8c0ff8163583314a 100644
|
| --- a/Source/platform/network/ResourceRequest.cpp
|
| +++ b/Source/platform/network/ResourceRequest.cpp
|
| @@ -50,12 +50,12 @@ PassOwnPtr<ResourceRequest> ResourceRequest::adopt(PassOwnPtr<CrossThreadResourc
|
| request->setReportUploadProgress(data->m_reportUploadProgress);
|
| request->setHasUserGesture(data->m_hasUserGesture);
|
| request->setDownloadToFile(data->m_downloadToFile);
|
| - request->setSkipServiceWorker(data->m_skipServiceWorker);
|
| request->setRequestorID(data->m_requestorID);
|
| request->setRequestorProcessID(data->m_requestorProcessID);
|
| request->setAppCacheHostID(data->m_appCacheHostID);
|
| request->setRequestContext(data->m_requestContext);
|
| request->setFrameType(data->m_frameType);
|
| + request->setServiceWorkerRequestMode(data->m_serviceWorkerRequestMode);
|
| request->m_referrerPolicy = data->m_referrerPolicy;
|
| return request.release();
|
| }
|
| @@ -78,12 +78,12 @@ PassOwnPtr<CrossThreadResourceRequestData> ResourceRequest::copyData() const
|
| data->m_reportUploadProgress = m_reportUploadProgress;
|
| data->m_hasUserGesture = m_hasUserGesture;
|
| data->m_downloadToFile = m_downloadToFile;
|
| - data->m_skipServiceWorker = m_skipServiceWorker;
|
| data->m_requestorID = m_requestorID;
|
| data->m_requestorProcessID = m_requestorProcessID;
|
| data->m_appCacheHostID = m_appCacheHostID;
|
| data->m_requestContext = m_requestContext;
|
| data->m_frameType = m_frameType;
|
| + data->m_serviceWorkerRequestMode = m_serviceWorkerRequestMode;
|
| data->m_referrerPolicy = m_referrerPolicy;
|
| return data.release();
|
| }
|
| @@ -397,7 +397,6 @@ void ResourceRequest::initialize(const KURL& url, ResourceRequestCachePolicy cac
|
| m_reportRawHeaders = false;
|
| m_hasUserGesture = false;
|
| m_downloadToFile = false;
|
| - m_skipServiceWorker = false;
|
| m_priority = ResourceLoadPriorityLow;
|
| m_intraPriorityValue = 0;
|
| m_requestorID = 0;
|
| @@ -405,6 +404,7 @@ void ResourceRequest::initialize(const KURL& url, ResourceRequestCachePolicy cac
|
| m_appCacheHostID = 0;
|
| m_requestContext = blink::WebURLRequest::RequestContextUnspecified;
|
| m_frameType = blink::WebURLRequest::FrameTypeNone;
|
| + m_serviceWorkerRequestMode = blink::WebURLRequest::ServiceWorkerRequestModeNoCORS;
|
| m_referrerPolicy = ReferrerPolicyDefault;
|
| }
|
|
|
|
|