Reland of Skip the Service Worker CORS fallback for same origin requests. [2/2 chromium]

content/browser/service_worker/service_worker_url_request_job.cc

 // 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 "content/browser/service_worker/service_worker_url_request_job.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 585 matching lines @@
       response_type_ = FALLBACK_TO_NETWORK;
       NotifyRestartRequired();
     } else {
       DeliverErrorResponse();
     }
     return;
   }
 
   if (fetch_result == SERVICE_WORKER_FETCH_EVENT_RESULT_FALLBACK) {
     ServiceWorkerMetrics::RecordFallbackedRequestMode(request_mode_);
-    // When the request_mode is |CORS| or |CORS-with-forced-preflight| we can't
-    // simply fallback to the network in the browser process. It is because the
-    // CORS preflight logic is implemented in the renderer. So we returns a
-    // fall_back_required response to the renderer.
-    if (request_mode_ == FETCH_REQUEST_MODE_CORS ||
-        request_mode_ == FETCH_REQUEST_MODE_CORS_WITH_FORCED_PREFLIGHT) {
+    // When the request_mode is |CORS| or |CORS-with-forced-preflight| and the
+    // origin of the request URL is different from the security origin of the
+    // document, we can't simply fallback to the network in the browser process.
+    // It is because the CORS preflight logic is implemented in the renderer. So
+    // we returns a fall_back_required response to the renderer.
+    if ((request_mode_ == FETCH_REQUEST_MODE_CORS ||
+         request_mode_ == FETCH_REQUEST_MODE_CORS_WITH_FORCED_PREFLIGHT) &&
+        provider_host_->document_url().GetOrigin() !=
+            request()->url().GetOrigin()) {
       fall_back_required_ = true;
       RecordResult(ServiceWorkerMetrics::REQUEST_JOB_FALLBACK_FOR_CORS);
       CreateResponseHeader(
           400, "Service Worker Fallback Required", ServiceWorkerHeaderMap());
       CommitResponseHeader();
       return;
     }
     // Change the response type and restart the request to fallback to
     // the network.
     RecordResult(ServiceWorkerMetrics::REQUEST_JOB_FALLBACK_RESPONSE);
@@ skipping 177 matching lines @@
   }
   if (!waiting_stream_url_.is_empty()) {
     StreamRegistry* stream_registry =
         GetStreamContextForResourceContext(resource_context_)->registry();
     stream_registry->RemoveRegisterObserver(waiting_stream_url_);
     stream_registry->AbortPendingStream(waiting_stream_url_);
   }
 }
 
 }  // namespace content