| Index: Source/platform/network/ResourceRequest.h
|
| diff --git a/Source/platform/network/ResourceRequest.h b/Source/platform/network/ResourceRequest.h
|
| index 0f6b023d51a42eecef96cde5f9835d3166df4c9f..95780f027124177cf40cd11bfb26bfc017009dad 100644
|
| --- a/Source/platform/network/ResourceRequest.h
|
| +++ b/Source/platform/network/ResourceRequest.h
|
| @@ -34,6 +34,7 @@
|
| #include "platform/network/ResourceLoadPriority.h"
|
| #include "platform/weborigin/KURL.h"
|
| #include "platform/weborigin/Referrer.h"
|
| +#include "public/platform/WebURLRequest.h"
|
| #include "wtf/OwnPtr.h"
|
|
|
| namespace WebCore {
|
| @@ -51,28 +52,6 @@ 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,
|
| - };
|
| -
|
| class ExtraData : public RefCounted<ExtraData> {
|
| public:
|
| virtual ~ExtraData() { }
|
| @@ -202,9 +181,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; }
|
| + blink::WebURLRequest::RequestContext requestContext() const { return m_requestContext; }
|
| + void setRequestContext(blink::WebURLRequest::RequestContext context) { m_requestContext = context; }
|
|
|
| bool cacheControlContainsNoCache() const;
|
| bool cacheControlContainsNoStore() const;
|
| @@ -238,7 +216,7 @@ private:
|
| int m_requestorProcessID;
|
| int m_appCacheHostID;
|
| RefPtr<ExtraData> m_extraData;
|
| - TargetType m_targetType;
|
| + blink::WebURLRequest::RequestContext m_requestContext;
|
| ReferrerPolicy m_referrerPolicy;
|
|
|
| mutable CacheControlHeader m_cacheControlHeaderCache;
|
| @@ -273,7 +251,7 @@ public:
|
| int m_requestorID;
|
| int m_requestorProcessID;
|
| int m_appCacheHostID;
|
| - ResourceRequest::TargetType m_targetType;
|
| + blink::WebURLRequest::RequestContext m_requestContext;
|
| ReferrerPolicy m_referrerPolicy;
|
| };
|
|
|
|
|