Chromium Code Reviews| Index: Source/platform/network/ResourceRequest.h |
| diff --git a/Source/platform/network/ResourceRequest.h b/Source/platform/network/ResourceRequest.h |
| index 0f6b023d51a42eecef96cde5f9835d3166df4c9f..d9fbfea3071911bf7c5f316c885d5875932a5273 100644 |
| --- a/Source/platform/network/ResourceRequest.h |
| +++ b/Source/platform/network/ResourceRequest.h |
| @@ -51,26 +51,32 @@ struct CrossThreadResourceRequestData; |
| class PLATFORM_EXPORT ResourceRequest { |
| WTF_MAKE_FAST_ALLOCATED; |
| public: |
| - // The type of this ResourceRequest, based on how the resource will be used. |
| - enum TargetType { |
| - TargetIsMainFrame, |
| - TargetIsSubframe, |
| - TargetIsSubresource, // Resource is a generic subresource. (Generally a specific type should be specified) |
| - TargetIsStyleSheet, |
| - TargetIsScript, |
| - TargetIsFont, |
| - TargetIsImage, |
| - TargetIsObject, |
| - TargetIsMedia, |
| - TargetIsWorker, |
| - TargetIsSharedWorker, |
| - TargetIsPrefetch, |
| - TargetIsFavicon, |
| - TargetIsXHR, |
| - TargetIsTextTrack, |
| - TargetIsPing, |
| - TargetIsServiceWorker, |
| - TargetIsUnspecified, |
| + // The request context of this ResourceRequest, as defined at http://fetch.spec.whatwg.org/#concept-request-context. |
| + enum RequestContext { |
|
abarth-chromium
2014/07/01 14:50:53
We can just use blink::URLRequest::RequestContext
Mike West
2014/07/01 15:00:20
One enum sounds great. That said, it looks like we
|
| + UnspecifiedContext, |
| + AudioContext, |
| + ConnectContext, |
| + DownloadContext, |
| + FaviconContext, |
| + FontContext, |
| + FormContext, |
| + ImageContext, |
| + MainFrameContext, |
| + ManifestContext, |
| + ObjectContext, |
| + ObjectRequestContext, |
| + PingContext, |
| + PopupContext, |
| + PrefetchContext, |
| + ScriptContext, |
| + ServiceWorkerContext, |
| + SharedWorkerContext, |
| + StyleContext, |
| + SubFrameContext, |
| + SubresourceContext, |
| + TextTrackContext, |
| + VideoContext, |
| + WorkerContext |
| }; |
| class ExtraData : public RefCounted<ExtraData> { |
| @@ -202,9 +208,8 @@ public: |
| ExtraData* extraData() const { return m_extraData.get(); } |
| void setExtraData(PassRefPtr<ExtraData> extraData) { m_extraData = extraData; } |
| - // What this request is for. |
| - TargetType targetType() const { return m_targetType; } |
| - void setTargetType(TargetType type) { m_targetType = type; } |
| + RequestContext requestContext() const { return m_requestContext; } |
| + void setRequestContext(RequestContext context) { m_requestContext = context; } |
| bool cacheControlContainsNoCache() const; |
| bool cacheControlContainsNoStore() const; |
| @@ -238,7 +243,7 @@ private: |
| int m_requestorProcessID; |
| int m_appCacheHostID; |
| RefPtr<ExtraData> m_extraData; |
| - TargetType m_targetType; |
| + RequestContext m_requestContext; |
| ReferrerPolicy m_referrerPolicy; |
| mutable CacheControlHeader m_cacheControlHeaderCache; |
| @@ -273,7 +278,7 @@ public: |
| int m_requestorID; |
| int m_requestorProcessID; |
| int m_appCacheHostID; |
| - ResourceRequest::TargetType m_targetType; |
| + ResourceRequest::RequestContext m_requestContext; |
| ReferrerPolicy m_referrerPolicy; |
| }; |