Revert 179125 "Drop the 'WebURLRequest::TargetType' enum."

trunk/public/platform/WebURLRequest.h

 /*
  * Copyright (C) 2009 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 49 matching lines @@
 
     enum Priority {
         PriorityUnresolved = -1,
         PriorityVeryLow,
         PriorityLow,
         PriorityMedium,
         PriorityHigh,
         PriorityVeryHigh,
     };
 
+    enum TargetType {
+        TargetIsMainFrame = 0,
+        TargetIsSubframe = 1,
+        TargetIsSubresource = 2,
+        TargetIsStyleSheet = 3,
+        TargetIsScript = 4,
+        TargetIsFontResource = 5,
+        TargetIsImage = 6,
+        TargetIsObject = 7,
+        TargetIsMedia = 8,
+        TargetIsWorker = 9,
+        TargetIsSharedWorker = 10,
+        TargetIsPrefetch = 11,
+        TargetIsFavicon = 12,
+        TargetIsXHR = 13,
+        TargetIsTextTrack = 14,
+        TargetIsPing = 15,
+        TargetIsServiceWorker = 16,
+        TargetIsUnspecified = 17,
+    };
+
     // Corresponds to Fetch's "context": http://fetch.spec.whatwg.org/#concept-request-context
+    //
+    // FIXME: Drop the TargetType enum once embedders are updated upstream.
     enum RequestContext {
         RequestContextUnspecified = 0,
         RequestContextInternal, // FIXME: This isn't part of Fetch. It should be.
         RequestContextAudio,
         RequestContextBeacon,
         RequestContextCSPReport,
         RequestContextDownload,
         RequestContextEmbed,
         RequestContextEventSource,
         RequestContextFavicon,
@@ skipping 89 matching lines @@
     // Controls whether upload progress events are generated when a request
     // has a body.
     BLINK_PLATFORM_EXPORT bool reportUploadProgress() const;
     BLINK_PLATFORM_EXPORT void setReportUploadProgress(bool);
 
     // Controls whether actual headers sent and received for request are
     // collected and reported.
     BLINK_PLATFORM_EXPORT bool reportRawHeaders() const;
     BLINK_PLATFORM_EXPORT void setReportRawHeaders(bool);
 
+    // FIXME: Remove these once content/ and net/ are updated.
+    BLINK_PLATFORM_EXPORT TargetType targetType() const;
+    BLINK_PLATFORM_EXPORT void setTargetType(TargetType);
+
     BLINK_PLATFORM_EXPORT RequestContext requestContext() const;
     BLINK_PLATFORM_EXPORT void setRequestContext(RequestContext);
 
     BLINK_PLATFORM_EXPORT FrameType frameType() const;
     BLINK_PLATFORM_EXPORT void setFrameType(FrameType);
 
     BLINK_PLATFORM_EXPORT WebReferrerPolicy referrerPolicy() const;
 
     // Adds an HTTP origin header if it is empty and the HTTP method of the
     // request requires it.
@@ skipping 32 matching lines @@
     BLINK_PLATFORM_EXPORT void setExtraData(ExtraData*);
 
     BLINK_PLATFORM_EXPORT Priority priority() const;
     BLINK_PLATFORM_EXPORT void setPriority(Priority);
 
 #if INSIDE_BLINK
     BLINK_PLATFORM_EXPORT blink::ResourceRequest& toMutableResourceRequest();
     BLINK_PLATFORM_EXPORT const blink::ResourceRequest& toResourceRequest() const;
 #endif
 
+    // FIXME: Drop these once we replace TargetType upstream.
+    static RequestContext requestContextFromTargetType(TargetType);
+    static TargetType targetTypeFromRequestContextAndFrameType(RequestContext, FrameType);
+
 protected:
     BLINK_PLATFORM_EXPORT void assign(WebURLRequestPrivate*);
 
 private:
     WebURLRequestPrivate* m_private;
 };
 
 } // namespace blink
 
 #endif