[ServiceWorker] Plumbing the request mode from the renderer to the ServiceWorker. [1/2 blink]

Source/platform/network/ResourceRequest.h

Index: Source/platform/network/ResourceRequest.h
diff --git a/Source/platform/network/ResourceRequest.h b/Source/platform/network/ResourceRequest.h
index 0f495554855fed915326c0352867cd27232aa8e5..0bd336f395756922c7f53742ab4f8cc601a34417 100644
--- a/Source/platform/network/ResourceRequest.h
+++ b/Source/platform/network/ResourceRequest.h
@@ -177,10 +177,6 @@ public:
     bool downloadToFile() const { return m_downloadToFile; }
     void setDownloadToFile(bool downloadToFile) { m_downloadToFile = downloadToFile; }
 
-    // True if the request should not be handled by the ServiceWorker.
-    bool skipServiceWorker() const { return m_skipServiceWorker; }
-    void setSkipServiceWorker(bool skipServiceWorker) { m_skipServiceWorker = skipServiceWorker; }
-
     // Extra data associated with this request.
     ExtraData* extraData() const { return m_extraData.get(); }
     void setExtraData(PassRefPtr<ExtraData> extraData) { m_extraData = extraData; }
@@ -191,6 +187,9 @@ public:
     blink::WebURLRequest::FrameType frameType() const { return m_frameType; }
     void setFrameType(blink::WebURLRequest::FrameType frameType) { m_frameType = frameType; }
 
+    blink::WebURLRequest::ServiceWorkerRequestMode serviceWorkerRequestMode() const { return m_serviceWorkerRequestMode; }
+    void setServiceWorkerRequestMode(blink::WebURLRequest::ServiceWorkerRequestMode mode) { m_serviceWorkerRequestMode = mode; }
+
     bool cacheControlContainsNoCache() const;
     bool cacheControlContainsNoStore() const;
     bool hasCacheValidatorFields() const;
@@ -217,7 +216,6 @@ private:
     bool m_reportRawHeaders : 1;
     bool m_hasUserGesture : 1;
     bool m_downloadToFile : 1;
-    bool m_skipServiceWorker : 1;
     ResourceLoadPriority m_priority;
     int m_intraPriorityValue;
     int m_requestorID;
@@ -226,6 +224,7 @@ private:
     RefPtr<ExtraData> m_extraData;
     blink::WebURLRequest::RequestContext m_requestContext;
     blink::WebURLRequest::FrameType m_frameType;
+    blink::WebURLRequest::ServiceWorkerRequestMode m_serviceWorkerRequestMode;
     ReferrerPolicy m_referrerPolicy;
 
     mutable CacheControlHeader m_cacheControlHeaderCache;
@@ -255,7 +254,6 @@ public:
     bool m_reportUploadProgress;
     bool m_hasUserGesture;
     bool m_downloadToFile;
-    bool m_skipServiceWorker;
     ResourceLoadPriority m_priority;
     int m_intraPriorityValue;
     int m_requestorID;
@@ -263,6 +261,7 @@ public:
     int m_appCacheHostID;
     blink::WebURLRequest::RequestContext m_requestContext;
     blink::WebURLRequest::FrameType m_frameType;
+    blink::WebURLRequest::ServiceWorkerRequestMode m_serviceWorkerRequestMode;
     ReferrerPolicy m_referrerPolicy;
 };