| Index: Source/modules/serviceworkers/FetchRequestData.h
|
| diff --git a/Source/modules/serviceworkers/FetchRequestData.h b/Source/modules/serviceworkers/FetchRequestData.h
|
| index f4920d9a04ebffad8dc27b4c766cccc577f5faa5..ffcaa35b21bfd713775f835a0c36de66e95c3233 100644
|
| --- a/Source/modules/serviceworkers/FetchRequestData.h
|
| +++ b/Source/modules/serviceworkers/FetchRequestData.h
|
| @@ -8,6 +8,7 @@
|
| #include "platform/heap/Handle.h"
|
| #include "platform/weborigin/KURL.h"
|
| #include "platform/weborigin/Referrer.h"
|
| +#include "public/platform/WebURLRequest.h"
|
| #include "wtf/PassOwnPtr.h"
|
| #include "wtf/PassRefPtr.h"
|
| #include "wtf/text/AtomicString.h"
|
| @@ -24,8 +25,6 @@ class WebServiceWorkerRequest;
|
| class FetchRequestData final : public GarbageCollectedFinalized<FetchRequestData> {
|
| WTF_MAKE_NONCOPYABLE(FetchRequestData);
|
| public:
|
| - enum Mode { SameOriginMode, NoCORSMode, CORSMode, CORSWithForcedPreflight };
|
| - enum Credentials { OmitCredentials, SameOriginCredentials, IncludeCredentials };
|
| enum Context { ChildContext, ConnectContext, DownloadContext, FontContext, FormContext, ImageContext, ManifestContext, MediaContext, NavigateContext, ObjectContext, PingContext, PopupContext, PrefetchContext, ScriptContext, ServiceWorkerContext, SharedWorkerContext, StyleContext, WorkerContext, NullContext };
|
| enum Tainting { BasicTainting, CORSTainting, OpaqueTainting };
|
|
|
| @@ -71,10 +70,10 @@ public:
|
| PassRefPtr<SecurityOrigin> origin() { return m_origin; }
|
| bool sameOriginDataURLFlag() { return m_sameOriginDataURLFlag; }
|
| const Referrer& referrer() const { return m_referrer; }
|
| - void setMode(Mode mode) { m_mode = mode; }
|
| - Mode mode() const { return m_mode; }
|
| - void setCredentials(Credentials credentials) { m_credentials = credentials; }
|
| - Credentials credentials() const { return m_credentials; }
|
| + void setMode(WebURLRequest::FetchRequestMode mode) { m_mode = mode; }
|
| + WebURLRequest::FetchRequestMode mode() const { return m_mode; }
|
| + void setCredentials(WebURLRequest::FetchCredentialsMode credentials) { m_credentials = credentials; }
|
| + WebURLRequest::FetchCredentialsMode credentials() const { return m_credentials; }
|
| void setResponseTainting(Tainting tainting) { m_responseTainting = tainting; }
|
| Tainting tainting() const { return m_responseTainting; }
|
| FetchHeaderList* headerList() { return m_headerList.get(); }
|
| @@ -101,8 +100,8 @@ private:
|
| Referrer m_referrer;
|
| // FIXME: Support m_authenticationFlag;
|
| // FIXME: Support m_synchronousFlag;
|
| - Mode m_mode;
|
| - Credentials m_credentials;
|
| + WebURLRequest::FetchRequestMode m_mode;
|
| + WebURLRequest::FetchCredentialsMode m_credentials;
|
| // FIXME: Support m_useURLCredentialsFlag;
|
| // FIXME: Support m_manualRedirectFlag;
|
| // FIXME: Support m_redirectCount;
|
|
|