Backed out changeset 88970726eb6b (bug 1119044) for Werror bustage.

dom/fetch/InternalRequest.cpp

@@ -32,7 +32,6 @@ InternalRequest::GetRequestConstructorCopy(nsIGlobalObject* aGlobal, ErrorResult
   copy->mContext = nsIContentPolicy::TYPE_FETCH;
   copy->mMode = mMode;
   copy->mCredentialsMode = mCredentialsMode;
-  copy->mCacheMode = mCacheMode;
   return copy.forget();
 }
 

dom/fetch/InternalRequest.h

@@ -62,7 +62,6 @@ public:
     , mCredentialsMode(RequestCredentials::Omit)
     , mResponseTainting(RESPONSETAINT_BASIC)
     , mRedirectCount(0)
-    , mCacheMode(RequestCache::Default)
     , mAuthenticationFlag(false)
     , mForceOriginHeader(false)
     , mManualRedirect(false)
@@ -92,7 +91,6 @@ public:
     , mCredentialsMode(aOther.mCredentialsMode)
     , mResponseTainting(aOther.mResponseTainting)
     , mRedirectCount(aOther.mRedirectCount)
-    , mCacheMode(aOther.mCacheMode)
     , mAuthenticationFlag(aOther.mAuthenticationFlag)
     , mForceOriginHeader(aOther.mForceOriginHeader)
     , mManualRedirect(aOther.mManualRedirect)
@@ -202,12 +200,6 @@ public:
     mResponseTainting = aTainting;
   }
 
-  RequestCache
-  GetCacheMode() const
-  {
-    return mCacheMode;
-  }
-
   nsContentPolicyType
   GetContext() const
   {
@@ -286,7 +278,6 @@ private:
   RequestMode mMode;
   RequestCredentials mCredentialsMode;
   ResponseTainting mResponseTainting;
-  RequestCache mCacheMode;
 
   uint32_t mRedirectCount;
 

dom/fetch/Request.cpp

@@ -128,16 +128,6 @@ Request::Constructor(const GlobalObject& aGlobal,
     fallbackCredentials = RequestCredentials::Omit;
   }
 
-  // CORS-with-forced-preflight is not publicly exposed and should not be
-  // considered a valid value.
-  if (aInit.mMode.WasPassed() &&
-      aInit.mMode.Value() == RequestMode::Cors_with_forced_preflight) {
-    NS_NAMED_LITERAL_STRING(sourceDescription, "'mode' member of RequestInit");
-    NS_NAMED_LITERAL_STRING(value, "cors-with-forced-preflight");
-    NS_NAMED_LITERAL_STRING(type, "RequestMode");
-    aRv.ThrowTypeError(MSG_INVALID_ENUM_VALUE, &sourceDescription, &value, &type);
-    return nullptr;
-  }
   RequestMode mode = aInit.mMode.WasPassed() ? aInit.mMode.Value() : fallbackMode;
   RequestCredentials credentials =
     aInit.mCredentials.WasPassed() ? aInit.mCredentials.Value()

dom/fetch/Request.h

@@ -56,9 +56,6 @@ public:
   RequestMode
   Mode() const
   {
-    if (mRequest->mMode == RequestMode::Cors_with_forced_preflight) {
-      return RequestMode::Cors;
-    }
     return mRequest->mMode;
   }
 
@@ -68,12 +65,6 @@ public:
     return mRequest->mCredentialsMode;
   }
 
-  RequestCache
-  Cache() const
-  {
-    return mRequest->GetCacheMode();
-  }
-
   void
   GetReferrer(DOMString& aReferrer) const
   {

dom/webidl/Request.webidl

@@ -15,16 +15,15 @@ typedef (Request or USVString) RequestInfo;
 interface Request {
   readonly attribute ByteString method;
   readonly attribute USVString url;
-  [SameObject] readonly attribute Headers headers;
+  readonly attribute Headers headers;
 
-  // FIXME(nsm) Bug 1119037: readonly attribute RequestContext context;
   readonly attribute DOMString referrer;
   readonly attribute RequestMode mode;
   readonly attribute RequestCredentials credentials;
-  readonly attribute RequestCache cache;
 
-  [NewObject] Request clone();
+  Request clone();
 };
+
 Request implements Body;
 
 dictionary RequestInit {
@@ -33,17 +32,7 @@ dictionary RequestInit {
   BodyInit body;
   RequestMode mode;
   RequestCredentials credentials;
-  RequestCache cache;
 };
 
-// FIXME(nsm): Bug 1119037 Implement RequestContext.
-
-// cors-with-forced-preflight is internal to the Fetch spec, but adding it here
-// allows us to use the various conversion conveniences offered by the WebIDL
-// codegen. The Request constructor has explicit checks to prevent it being
-// passed as a valid value, while Request.mode never returns it. Since enums
-// are only exposed as strings to client JS, this has the same effect as not
-// exposing it at all.
 enum RequestMode { "same-origin", "no-cors", "cors", "cors-with-forced-preflight" };
 enum RequestCredentials { "omit", "same-origin", "include" };
-enum RequestCache { "default", "no-store", "reload", "no-cache", "force-cache", "only-if-cached" };

dom/webidl/Response.webidl

@@ -11,18 +11,19 @@
  Exposed=(Window,Worker),
  Func="mozilla::dom::Headers::PrefEnabled"]
 interface Response {
-  [NewObject] static Response error();
-  [NewObject] static Response redirect(USVString url, optional unsigned short status = 302);
+  static Response error();
+  static Response redirect(USVString url, optional unsigned short status = 302);
 
   readonly attribute ResponseType type;
 
   readonly attribute USVString url;
   readonly attribute unsigned short status;
   readonly attribute ByteString statusText;
-  [SameObject] readonly attribute Headers headers;
+  readonly attribute Headers headers;
 
-  [NewObject] Response clone();
+  Response clone();
 };
+
 Response implements Body;
 
 dictionary ResponseInit {

dom/workers/test/fetch/worker_test_request.js

@@ -205,28 +205,6 @@ function testBodyExtraction() {
   })
 }
 
-// mode cannot be set to "CORS-with-forced-preflight" from javascript.
-function testModeCorsPreflightEnumValue() {
-  try {
-    var r = new Request(".", { mode: "cors-with-forced-preflight" });
-    ok(false, "Creating Request with mode cors-with-forced-preflight should fail.");
-  } catch(e) {
-    ok(true, "Creating Request with mode cors-with-forced-preflight should fail.");
-    // Also ensure that the error message matches error messages for truly
-    // invalid strings.
-    var invalidMode = "not-in-requestmode-enum";
-    var invalidExc;
-    try {
-      var r = new Request(".", { mode: invalidMode });
-    } catch(e) {
-      invalidExc = e;
-    }
-    var expectedMessage = invalidExc.message.replace(invalidMode, 'cors-with-forced-preflight');
-    is(e.message, expectedMessage,
-       "mode cors-with-forced-preflight should throw same error as invalid RequestMode strings.");
-  }
-}
-
 onmessage = function() {
   var done = function() { postMessage({ type: 'finish' }) }
 
@@ -236,7 +214,6 @@ onmessage = function() {
   testUrlFragment();
   testMethod();
   testBug1109574();
-  testModeCorsPreflightEnumValue();
 
   Promise.resolve()
     .then(testBodyCreation)