Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1619)

Unified Diff: Source/platform/network/ResourceRequest.h

Issue 360233005: Replace 'ResourceRequest::TargetType' with 'ResourceRequest::RequestContext'. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Uninitialized === crash. :( Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/platform/exported/WebURLRequest.cpp ('k') | Source/platform/network/ResourceRequest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
};
« no previous file with comments | « Source/platform/exported/WebURLRequest.cpp ('k') | Source/platform/network/ResourceRequest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698