Replace 'ResourceRequest::TargetType' with 'ResourceRequest::RequestContext'.

Source/platform/network/ResourceRequest.h

 /*
  * Copyright (C) 2003, 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
  * Copyright (C) 2009, 2012 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 33 matching lines @@
     ReturnCacheDataElseLoad, // back/forward or encoding change - allow stale data
     ReturnCacheDataDontLoad, // results of a post - allow stale data and only use cache
     ReloadBypassingCache, // end-to-end reload
 };
 
 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 directly.  There's no reason
to have two copies of the enum.

[Mike West, 2014/07/01 15:00:20]

One enum sounds great. That said, it looks like we wrap most enums when
exporting them; all the WebURLRequest enums are wrapping internal Blink enums so
far as I can tell. Is that just a historical artifact?

+        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> {
     public:
         virtual ~ExtraData() { }
     };
 
     ResourceRequest()
     {
         initialize(KURL(), UseProtocolCachePolicy);
@@ skipping 111 matching lines @@
     void setHasUserGesture(bool hasUserGesture) { m_hasUserGesture = hasUserGesture; }
 
     // True if request should be downloaded to file.
     bool downloadToFile() const { return m_downloadToFile; }
     void setDownloadToFile(bool downloadToFile) { m_downloadToFile = downloadToFile; }
 
     // Extra data associated with this request.
     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;
     bool hasCacheValidatorFields() const;
 
     static double defaultTimeoutInterval(); // May return 0 when using platform default.
     static void setDefaultTimeoutInterval(double);
 
     static bool compare(const ResourceRequest&, const ResourceRequest&);
 
@@ skipping 13 matching lines @@
     bool m_reportUploadProgress : 1;
     bool m_reportRawHeaders : 1;
     bool m_hasUserGesture : 1;
     bool m_downloadToFile : 1;
     ResourceLoadPriority m_priority;
     int m_intraPriorityValue;
     int m_requestorID;
     int m_requestorProcessID;
     int m_appCacheHostID;
     RefPtr<ExtraData> m_extraData;
-    TargetType m_targetType;
+    RequestContext m_requestContext;
     ReferrerPolicy m_referrerPolicy;
 
     mutable CacheControlHeader m_cacheControlHeaderCache;
 
     static double s_defaultTimeoutInterval;
 };
 
 bool equalIgnoringHeaderFields(const ResourceRequest&, const ResourceRequest&);
 
 inline bool operator==(const ResourceRequest& a, const ResourceRequest& b) { return ResourceRequest::compare(a, b); }
@@ skipping 14 matching lines @@
     RefPtr<FormData> m_httpBody;
     bool m_allowStoredCredentials;
     bool m_reportUploadProgress;
     bool m_hasUserGesture;
     bool m_downloadToFile;
     ResourceLoadPriority m_priority;
     int m_intraPriorityValue;
     int m_requestorID;
     int m_requestorProcessID;
     int m_appCacheHostID;
-    ResourceRequest::TargetType m_targetType;
+    ResourceRequest::RequestContext m_requestContext;
     ReferrerPolicy m_referrerPolicy;
 };
 
 unsigned initializeMaximumHTTPConnectionCountPerHost();
 
 } // namespace WebCore
 
 #endif // ResourceRequest_h