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

Source/core/fetch/ResourceFetcher.cpp

Index: Source/core/fetch/ResourceFetcher.cpp
diff --git a/Source/core/fetch/ResourceFetcher.cpp b/Source/core/fetch/ResourceFetcher.cpp
index fbf3ebea262ee26e21c864fa3a8aac5a5c467e10..58817c52863bbb1c6b40031431dc4c744f53f535 100644
--- a/Source/core/fetch/ResourceFetcher.cpp
+++ b/Source/core/fetch/ResourceFetcher.cpp
@@ -186,39 +186,40 @@ static void reportResourceTiming(ResourceTimingInfo* info, Document* initiatorDo
         initiatorWindow->performance().addResourceTiming(*info, initiatorDocument);
 }
 
-static ResourceRequest::TargetType requestTargetType(const ResourceFetcher* fetcher, const ResourceRequest& request, Resource::Type type)
+static ResourceRequest::RequestContext requestContextFromType(const ResourceFetcher* fetcher, Resource::Type type)
 {
     switch (type) {
     case Resource::MainResource:
         if (fetcher->frame()->tree().parent())
-            return ResourceRequest::TargetIsSubframe;
-        return ResourceRequest::TargetIsMainFrame;
+            return ResourceRequest::SubFrameContext;
+        return ResourceRequest::MainFrameContext;
     case Resource::XSLStyleSheet:
         ASSERT(RuntimeEnabledFeatures::xsltEnabled());
     case Resource::CSSStyleSheet:
-        return ResourceRequest::TargetIsStyleSheet;
+        return ResourceRequest::StyleContext;
     case Resource::Script:
-        return ResourceRequest::TargetIsScript;
+        return ResourceRequest::ScriptContext;
     case Resource::Font:
-        return ResourceRequest::TargetIsFont;
+        return ResourceRequest::FontContext;
     case Resource::Image:
-        return ResourceRequest::TargetIsImage;
+        return ResourceRequest::ImageContext;
     case Resource::Raw:
+        return ResourceRequest::SubresourceContext;
     case Resource::ImportResource:
-        return ResourceRequest::TargetIsSubresource;
+        return ResourceRequest::ScriptContext;
     case Resource::LinkPrefetch:
-        return ResourceRequest::TargetIsPrefetch;
+        return ResourceRequest::PrefetchContext;
     case Resource::LinkSubresource:
-        return ResourceRequest::TargetIsSubresource;
+        return ResourceRequest::SubresourceContext;
     case Resource::TextTrack:
-        return ResourceRequest::TargetIsTextTrack;
+        return ResourceRequest::TextTrackContext;
     case Resource::SVGDocument:
-        return ResourceRequest::TargetIsImage;
-    case Resource::Media:
-        return ResourceRequest::TargetIsMedia;
+        return ResourceRequest::ImageContext;
+    case Resource::Media: // TODO: Split this.
+        return ResourceRequest::VideoContext;
     }
     ASSERT_NOT_REACHED();
-    return ResourceRequest::TargetIsSubresource;
+    return ResourceRequest::SubresourceContext;
 }
 
 ResourceFetcher::ResourceFetcher(DocumentLoader* documentLoader)
@@ -789,10 +790,10 @@ void ResourceFetcher::resourceTimingReportTimerFired(Timer<ResourceFetcher>* tim
     }
 }
 
-void ResourceFetcher::determineTargetType(ResourceRequest& request, Resource::Type type)
+void ResourceFetcher::determineRequestContext(ResourceRequest& request, Resource::Type type)
 {
-    ResourceRequest::TargetType targetType = requestTargetType(this, request, type);
-    request.setTargetType(targetType);
+    ResourceRequest::RequestContext requestContext = requestContextFromType(this, type);
+    request.setRequestContext(requestContext);
 }
 
 ResourceRequestCachePolicy ResourceFetcher::resourceRequestCachePolicy(const ResourceRequest& request, Resource::Type type)
@@ -834,8 +835,8 @@ void ResourceFetcher::addAdditionalRequestHeaders(ResourceRequest& request, Reso
 
     if (request.cachePolicy() == UseProtocolCachePolicy)
         request.setCachePolicy(resourceRequestCachePolicy(request, type));
-    if (request.targetType() == ResourceRequest::TargetIsUnspecified)
-        determineTargetType(request, type);
+    if (request.requestContext() == ResourceRequest::UnspecifiedContext)
+        determineRequestContext(request, type);
     if (type == Resource::LinkPrefetch || type == Resource::LinkSubresource)
         request.setHTTPHeaderField("Purpose", "prefetch");