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

Source/core/fetch/ResourceFetcher.cpp

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
     Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
@@ skipping 48 matching lines @@
 #include "core/timing/ResourceTimingInfo.h"
 #include "core/frame/Settings.h"
 #include "core/svg/graphics/SVGImageChromeClient.h"
 #include "platform/Logging.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/TraceEvent.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "platform/weborigin/SecurityPolicy.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebURL.h"
+#include "public/platform/WebURLRequest.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/WTFString.h"
 
 #define PRELOAD_DEBUG 0
 
+using blink::WebURLRequest;
+
 namespace WebCore {
 
 static Resource* createResource(Resource::Type type, const ResourceRequest& request, const String& charset)
 {
     switch (type) {
     case Resource::Image:
         return new ImageResource(request);
     case Resource::CSSStyleSheet:
         return new CSSStyleSheetResource(request, charset);
     case Resource::Script:
@@ skipping 95 matching lines @@
 static void reportResourceTiming(ResourceTimingInfo* info, Document* initiatorDocument, bool isMainResource)
 {
     if (initiatorDocument && isMainResource)
         initiatorDocument = initiatorDocument->parentDocument();
     if (!initiatorDocument || !initiatorDocument->loader())
         return;
     if (LocalDOMWindow* initiatorWindow = initiatorDocument->domWindow())
         initiatorWindow->performance().addResourceTiming(*info, initiatorDocument);
 }
 
-static ResourceRequest::TargetType requestTargetType(const ResourceFetcher* fetcher, const ResourceRequest& request, Resource::Type type)
+static WebURLRequest::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 WebURLRequest::RequestContextChildDocument;
+        return WebURLRequest::RequestContextDocument;
     case Resource::XSLStyleSheet:
         ASSERT(RuntimeEnabledFeatures::xsltEnabled());
     case Resource::CSSStyleSheet:
-        return ResourceRequest::TargetIsStyleSheet;
+        return WebURLRequest::RequestContextStyle;
     case Resource::Script:
-        return ResourceRequest::TargetIsScript;
+        return WebURLRequest::RequestContextScript;
     case Resource::Font:
-        return ResourceRequest::TargetIsFont;
+        return WebURLRequest::RequestContextFont;
     case Resource::Image:
-        return ResourceRequest::TargetIsImage;
+        return WebURLRequest::RequestContextImage;
     case Resource::Raw:
+        return WebURLRequest::RequestContextSubresource;
     case Resource::ImportResource:
-        return ResourceRequest::TargetIsSubresource;
+        return WebURLRequest::RequestContextScript;
     case Resource::LinkPrefetch:
-        return ResourceRequest::TargetIsPrefetch;
+        return WebURLRequest::RequestContextPrefetch;
     case Resource::LinkSubresource:
-        return ResourceRequest::TargetIsSubresource;
+        return WebURLRequest::RequestContextSubresource;
     case Resource::TextTrack:
-        return ResourceRequest::TargetIsTextTrack;
+        return WebURLRequest::RequestContextTextTrack;
     case Resource::SVGDocument:
-        return ResourceRequest::TargetIsImage;
-    case Resource::Media:
-        return ResourceRequest::TargetIsMedia;
+        return WebURLRequest::RequestContextImage;
+    case Resource::Media: // TODO: Split this.
+        return WebURLRequest::RequestContextVideo;
     }
     ASSERT_NOT_REACHED();
-    return ResourceRequest::TargetIsSubresource;
+    return WebURLRequest::RequestContextSubresource;
 }
 
 ResourceFetcher::ResourceFetcher(DocumentLoader* documentLoader)
     : m_document(nullptr)
     , m_documentLoader(documentLoader)
     , m_requestCount(0)
     , m_garbageCollectDocumentResourcesTimer(this, &ResourceFetcher::garbageCollectDocumentResourcesTimerFired)
     , m_resourceTimingReportTimer(this, &ResourceFetcher::resourceTimingReportTimerFired)
     , m_autoLoadImages(true)
     , m_imagesEnabled(true)
@@ skipping 539 matching lines @@
     HashMap<RefPtr<ResourceTimingInfo>, bool> timingReports;
     timingReports.swap(m_scheduledResourceTimingReports);
     HashMap<RefPtr<ResourceTimingInfo>, bool>::iterator end = timingReports.end();
     for (HashMap<RefPtr<ResourceTimingInfo>, bool>::iterator it = timingReports.begin(); it != end; ++it) {
         RefPtr<ResourceTimingInfo> info = it->key;
         bool isMainResource = it->value;
         reportResourceTiming(info.get(), document(), isMainResource);
     }
 }
 
-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);
+    WebURLRequest::RequestContext requestContext = requestContextFromType(this, type);
+    request.setRequestContext(requestContext);
 }
 
 ResourceRequestCachePolicy ResourceFetcher::resourceRequestCachePolicy(const ResourceRequest& request, Resource::Type type)
 {
     if (type == Resource::MainResource) {
         FrameLoadType frameLoadType = frame()->loader().loadType();
         if (request.httpMethod() == "POST" && frameLoadType == FrameLoadTypeBackForward)
             return ReturnCacheDataDontLoad;
         if (!m_documentLoader->overrideEncoding().isEmpty() || frameLoadType == FrameLoadTypeBackForward)
             return ReturnCacheDataElseLoad;
@@ skipping 21 matching lines @@
     return UseProtocolCachePolicy;
 }
 
 void ResourceFetcher::addAdditionalRequestHeaders(ResourceRequest& request, Resource::Type type)
 {
     if (!frame())
         return;
 
     if (request.cachePolicy() == UseProtocolCachePolicy)
         request.setCachePolicy(resourceRequestCachePolicy(request, type));
-    if (request.targetType() == ResourceRequest::TargetIsUnspecified)
-        determineTargetType(request, type);
+    if (request.requestContext() == WebURLRequest::RequestContextUnspecified)
+        determineRequestContext(request, type);
     if (type == Resource::LinkPrefetch || type == Resource::LinkSubresource)
         request.setHTTPHeaderField("Purpose", "prefetch");
 
     context().addAdditionalRequestHeaders(document(), request, (type == Resource::MainResource) ? FetchMainResource : FetchSubresource);
 }
 
 ResourcePtr<Resource> ResourceFetcher::createResourceForRevalidation(const FetchRequest& request, Resource* resource)
 {
     ASSERT(resource);
     ASSERT(memoryCache()->contains(resource));
@@ skipping 651 matching lines @@
     }
 }
 
 void ResourceFetcher::trace(Visitor* visitor)
 {
     visitor->trace(m_document);
     ResourceLoaderHost::trace(visitor);
 }
 
 }