Cross origin requests to same origin should match

third_party/WebKit/Source/core/fetch/FetchRequest.cpp

Index: third_party/WebKit/Source/core/fetch/FetchRequest.cpp
diff --git a/third_party/WebKit/Source/core/fetch/FetchRequest.cpp b/third_party/WebKit/Source/core/fetch/FetchRequest.cpp
index 7fe6ab527e118d8693f95b878173e8e8bbe4f019..a3c24ddc1e064f912c5041884b065fa32cb5783e 100644
--- a/third_party/WebKit/Source/core/fetch/FetchRequest.cpp
+++ b/third_party/WebKit/Source/core/fetch/FetchRequest.cpp
@@ -73,23 +73,24 @@ FetchRequest::~FetchRequest()
 
 void FetchRequest::setCrossOriginAccessControl(SecurityOrigin* origin, CrossOriginAttributeValue crossOrigin)
 {
-    ASSERT(crossOrigin != CrossOriginAttributeNotSet);
     const bool useCredentials = crossOrigin == CrossOriginAttributeUseCredentials;
     const bool isSameOriginRequest = origin && origin->canRequestNoSuborigin(m_resourceRequest.url());
+    const CORSEnabled corsEnabled = (crossOrigin != CrossOriginAttributeNotSet) ? IsCORSEnabled : NotCORSEnabled;
 
-    // Currently FetchRequestMode and FetchCredentialsMode are only used when the request goes to Service Worker.
-    m_resourceRequest.setFetchRequestMode(WebURLRequest::FetchRequestModeCORS);
-    m_resourceRequest.setFetchCredentialsMode(useCredentials ? WebURLRequest::FetchCredentialsModeInclude : WebURLRequest::FetchCredentialsModeSameOrigin);
 
-    m_options.allowCredentials = (isSameOriginRequest || useCredentials) ? AllowStoredCredentials : DoNotAllowStoredCredentials;
-    m_options.corsEnabled = IsCORSEnabled;
-    m_options.securityOrigin = origin;
-    m_options.credentialsRequested = useCredentials ? ClientRequestedCredentials : ClientDidNotRequestCredentials;
-
-    updateRequestForAccessControl(m_resourceRequest, origin, m_options.allowCredentials);
+    m_options.sameOrigin = isSameOriginRequest ? IsSameOrigin : NotSameOrigin;

[Nate Chapin, 2016/03/17 22:58:18]

Instead of having this sameOrigin property, why not check
canRequestNoSuborigin() when needed?

[Yoav Weiss, 2016/03/18 07:53:14]

Because we don't necessarily have the securityOrigin nor the URL in
canReuseRequest right now. But I guess we could set the origin here and pipe the
URL in from the callers.

+    m_options.corsEnabled = corsEnabled;
+    if (corsEnabled) {
+        // Currently FetchRequestMode and FetchCredentialsMode are only used when the request goes to Service Worker.
+        m_resourceRequest.setFetchRequestMode(WebURLRequest::FetchRequestModeCORS);
+        m_resourceRequest.setFetchCredentialsMode(useCredentials ? WebURLRequest::FetchCredentialsModeInclude : WebURLRequest::FetchCredentialsModeSameOrigin);
+        m_options.allowCredentials = (isSameOriginRequest || useCredentials) ? AllowStoredCredentials : DoNotAllowStoredCredentials;
+        m_options.securityOrigin = origin;
+        m_options.credentialsRequested = useCredentials ? ClientRequestedCredentials : ClientDidNotRequestCredentials;
+        updateRequestForAccessControl(m_resourceRequest, origin, m_options.allowCredentials);
+    }
 }
 
-
 void FetchRequest::setResourceWidth(ResourceWidth resourceWidth)
 {
     if (resourceWidth.isSet) {