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

public/platform/WebURLRequest.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 92 matching lines @@
     };
 
     // Corresponds to Fetch's "context frame type": http://fetch.spec.whatwg.org/#concept-request-context-frame-type
     enum FrameType {
         FrameTypeAuxiliary,
         FrameTypeNested,
         FrameTypeNone,
         FrameTypeTopLevel
     };
 
+    enum ServiceWorkerRequestMode {

[yhirano, 2014/09/25 02:08:44]

Is this name appropriate? Having FetchRequestMode and skipServiceWorkerFlag
decoupled makes more sense to me.

[horo, 2014/09/25 03:55:18]

Done.

+        ServiceWorkerRequestModeSkip,
+        ServiceWorkerRequestModeSameOrigin,
+        ServiceWorkerRequestModeNoCORS,
+        ServiceWorkerRequestModeCORS,
+        ServiceWorkerRequestModeCORSWithForcedPreflight
+    };
+
     class ExtraData {
     public:
         virtual ~ExtraData() { }
     };
 
     ~WebURLRequest() { reset(); }
 
     WebURLRequest() : m_private(0) { }
     WebURLRequest(const WebURLRequest& r) : m_private(0) { assign(r); }
     WebURLRequest& operator=(const WebURLRequest& r)
@@ skipping 81 matching lines @@
 
     // Allows the request to be matched up with its app cache host.
     BLINK_PLATFORM_EXPORT int appCacheHostID() const;
     BLINK_PLATFORM_EXPORT void setAppCacheHostID(int);
 
     // If true, the response body will be downloaded to a file managed by the
     // WebURLLoader. See WebURLResponse::downloadedFilePath.
     BLINK_PLATFORM_EXPORT bool downloadToFile() const;
     BLINK_PLATFORM_EXPORT void setDownloadToFile(bool);
 
-    // True if the request should not be handled by the ServiceWorker.
+    // FIXME: Remove this.
     BLINK_PLATFORM_EXPORT bool skipServiceWorker() const;
-    BLINK_PLATFORM_EXPORT void setSkipServiceWorker(bool);
+    // The request mode which will be passed to the ServiceWorker.
+    BLINK_PLATFORM_EXPORT ServiceWorkerRequestMode serviceWorkerRequestMode() const;
+    BLINK_PLATFORM_EXPORT void setServiceWorkerRequestMode(ServiceWorkerRequestMode);
 
     // Extra data associated with the underlying resource request. Resource
     // requests can be copied. If non-null, each copy of a resource requests
     // holds a pointer to the extra data, and the extra data pointer will be
     // deleted when the last resource request is destroyed. Setting the extra
     // data pointer will cause the underlying resource request to be
     // dissociated from any existing non-null extra data pointer.
     BLINK_PLATFORM_EXPORT ExtraData* extraData() const;
     BLINK_PLATFORM_EXPORT void setExtraData(ExtraData*);
 
     BLINK_PLATFORM_EXPORT Priority priority() const;
     BLINK_PLATFORM_EXPORT void setPriority(Priority);
 
 #if INSIDE_BLINK
     BLINK_PLATFORM_EXPORT ResourceRequest& toMutableResourceRequest();
     BLINK_PLATFORM_EXPORT const ResourceRequest& toResourceRequest() const;
 #endif
 
 protected:
     BLINK_PLATFORM_EXPORT void assign(WebURLRequestPrivate*);
 
 private:
     WebURLRequestPrivate* m_private;
 };
 
 } // namespace blink
 
 #endif