| Index: public/platform/WebURLRequest.h
|
| diff --git a/public/platform/WebURLRequest.h b/public/platform/WebURLRequest.h
|
| index b26d4704194f2ee44fab170af0593d23b0adbced..8856a4cb9c35aa009622e6b4b1af10374a15b447 100644
|
| --- a/public/platform/WebURLRequest.h
|
| +++ b/public/platform/WebURLRequest.h
|
| @@ -67,30 +67,7 @@ public:
|
| 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.
|
| @@ -200,10 +177,6 @@ public:
|
| 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);
|
|
|
| @@ -256,10 +229,6 @@ public:
|
| 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*);
|
|
|
|
|