Skip the Service Worker CORS fallback for same origin requests. [1/2 blink]

Source/core/loader/DocumentThreadableLoader.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2013, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 434 matching lines @@
             // when the ServiceWorker does not call respondWith().)
             ASSERT(m_fallbackRequestForServiceWorker);
             loadFallbackRequestForServiceWorker();
             return;
         }
         m_fallbackRequestForServiceWorker = nullptr;
         m_client->didReceiveResponse(identifier, response, handle);
         return;
     }
 
-    ASSERT(!m_fallbackRequestForServiceWorker);
+    // |m_fallbackRequestForServiceWorker| may be set only wheh the request is

[tyoshino (SeeGerritForStatus), 2015/07/22 11:25:45]

wheh -> when

+    // same origin, because we skip the Service Worker CORS fallback for same
+    // origin requests.

[tyoshino (SeeGerritForStatus), 2015/07/22 11:25:45]

|m_fallbackRequestForServiceWorker| being set is not a result of loading. So,
this text looks a little strange.

It's hard to phrase... How about:

Even if the request met the conditions to get handled by a Service Worker in the
constructor of this class (and therefore |m_fallbackRequestForServiceWorker| is
set), the Service Worker may skip processing the request. Only if the request is
same origin, the skipped response may come here (wasFetchedViaServiceWorker()
returns false) since such a request doesn't have to go through the CORS
algorithm by calling loadFallbackRequestForServiceWorker().

[horo, 2015/07/22 14:28:08]

Done.

+    // FIXME: We should use |m_sameOriginRequest| when we will support
+    // Suborigins for Service Worker.
+    ASSERT(!m_fallbackRequestForServiceWorker || securityOrigin()->canRequest(m_fallbackRequestForServiceWorker->url()));
+    m_fallbackRequestForServiceWorker = nullptr;
 
     if (!m_sameOriginRequest && m_options.crossOriginRequestPolicy == UseAccessControl) {
         String accessControlErrorDescription;
         if (!passesAccessControlCheck(response, effectiveAllowCredentials(), securityOrigin(), accessControlErrorDescription)) {
             reportResponseReceived(identifier, response);
             m_client->didFailAccessControlCheck(ResourceError(errorDomainBlinkInternal, 0, response.url().string(), accessControlErrorDescription));
             return;
         }
     }
 
@@ skipping 198 matching lines @@
         return DoNotAllowStoredCredentials;
     return m_resourceLoaderOptions.allowCredentials;
 }
 
 SecurityOrigin* DocumentThreadableLoader::securityOrigin() const
 {
     return m_securityOrigin ? m_securityOrigin.get() : m_document.securityOrigin();
 }
 
 } // namespace blink