Introduce "navigate" mode in Requests

third_party/WebKit/Source/modules/fetch/Request.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "modules/fetch/Request.h"
 
 #include "bindings/core/v8/Dictionary.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
@@ skipping 102 matching lines @@
         }
         // TODO(yhirano): "3. If |parsedURL| includes credentials, throw a
         // TypeError."
         // "4. Set |request|'s url to |parsedURL|."
         request->setURL(parsedURL);
         // "5. Set |fallbackMode| to CORS."
         // "6. Set |fallbackCredentials| to omit."
         // We don't use fallback values. We set these flags directly in below.
     }
 
-    //   14. If any of |init|'s members are present, set |request|'s referrer
-    // to client, and |request|'s referrer policy to the empty string.
-    //   => RequestInit::RequestInit.
+    // "14. If any of |init|'s members are present, run these substeps:"
+    if (init.areAnyMembersSet) {
+        // "1. If |request|'s |mode| is "navigate", throw a TypeError."
+        if (request->mode() == WebURLRequest::FetchRequestModeNavigate) {
+            exceptionState.throwTypeError("Cannot construct a Request from a Request having mode set as 'navigate' with RequestInit members being set and mode 'navigate' cannot be specified in Request constructor.");

[yhirano, 2015/11/06 07:50:24]

[optional] "Cannot construct a Request with a Request whose mode is 'navigate'
and a non-empty RequestInit." might be clearer.

[shiva.jm, 2015/11/09 07:15:47]

Done.

+            return nullptr;
+        }
+        // "2. Unset |request|'s omit-Origin-header flag."
+        // "3. Set |request|'s referrer to "client"."
+        // "4. Set |request|'s referrer policy to the empty string."
+        // => RequestInit::RequestInit.
+    }
+
     //   15. If |init|'s referrer member is present, run these substeps:
     // Note that JS null and undefined are encoded as an empty string and thus
     // a null string means referrer member is not set.
     //   16. If |init|'s referrerPolicy member is present, set |request|'s
     // referrer policy to it.
-    if (init.isReferrerSet) {
+    // areAnyMembersSet will be True, if any members in RequestInit are set and
+    // hence the referrer member
+    if (init.areAnyMembersSet) {
         // 1. Let |referrer| be |init|'s referrer member.
         if (init.referrer.referrer.isEmpty()) {
             // 2. if |referrer| is the empty string, set |request|'s referrer to
             // "no-referrer" and terminate these substeps.
             request->setReferrerString(FetchRequestData::noReferrerString());
         } else {
             // 3. Let |parsedReferrer| be the result of parsing |referrer| with
             // |baseURL|.
             KURL parsedReferrer = scriptState->executionContext()->completeURL(init.referrer.referrer);
             if (!parsedReferrer.isValid()) {
@@ skipping 12 matching lines @@
                 exceptionState.throwTypeError("The origin of '" + init.referrer.referrer + "' should be same as '" + origin->toString() + "'");
                 return nullptr;
             } else {
                 // 7. Set |request|'s referrer to |parsedReferrer|.
                 request->setReferrerString(AtomicString(parsedReferrer.string()));
             }
         }
         request->setReferrerPolicy(init.referrer.referrerPolicy);
     }
 
-
-    // "17. Let |mode| be |init|'s mode member if it is present, and
+    // "16. Let |mode| be |init|'s mode member if it is present, and
     // |fallbackMode| otherwise."
+    // "17. If |mode| is "navigate", throw a TypeError.
     // "18. If |mode| is non-null, set |request|'s mode to |mode|."
+    if (init.mode == "navigate") {
+        exceptionState.throwTypeError("Cannot construct a Request from a Request having mode set as 'navigate' with RequestInit members being set and mode 'navigate' cannot be specified in Request constructor.");

[yhirano, 2015/11/06 07:50:24]

"Cannot construct a Request with a RequestInit whose mode member is set as
'navigate'."

[shiva.jm, 2015/11/09 07:15:47]

Done.

+        return nullptr;
+    }
     if (init.mode == "same-origin") {
         request->setMode(WebURLRequest::FetchRequestModeSameOrigin);
     } else if (init.mode == "no-cors") {
         request->setMode(WebURLRequest::FetchRequestModeNoCORS);
     } else if (init.mode == "cors") {
         request->setMode(WebURLRequest::FetchRequestModeCORS);
     } else {
         if (!inputRequest)
             request->setMode(WebURLRequest::FetchRequestModeCORS);
     }
@@ skipping 312 matching lines @@
     // "The mode attribute's getter must return the value corresponding to the
     // first matching statement, switching on request's mode:"
     switch (m_request->mode()) {
     case WebURLRequest::FetchRequestModeSameOrigin:
         return "same-origin";
     case WebURLRequest::FetchRequestModeNoCORS:
         return "no-cors";
     case WebURLRequest::FetchRequestModeCORS:
     case WebURLRequest::FetchRequestModeCORSWithForcedPreflight:
         return "cors";
+    case WebURLRequest::FetchRequestModeNavigate:
+        return "navigate";
     }
     ASSERT_NOT_REACHED();
     return "";
 }
 
 String Request::credentials() const
 {
     // "The credentials attribute's getter must return the value corresponding
     // to the first matching statement, switching on request's credentials
     // mode:"
@@ skipping 79 matching lines @@
 }
 
 DEFINE_TRACE(Request)
 {
     Body::trace(visitor);
     visitor->trace(m_request);
     visitor->trace(m_headers);
 }
 
 } // namespace blink