Set SkipServiceWorker flag in DocumentThreadableLoader::loadActualRequest().

third_party/WebKit/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 771 matching lines @@
 {
     ResourceRequest actualRequest = m_actualRequest;
     ResourceLoaderOptions actualOptions = m_actualOptions;
     m_actualRequest = ResourceRequest();
     m_actualOptions = ResourceLoaderOptions();
 
     actualRequest.setHTTPOrigin(getSecurityOrigin());
 
     clearResource();
 
+    // Explicitly set the SkipServiceWorker flag here. Even if the page was not
+    // controlled by a SW when the preflight request was sent, a new SW may be
+    // controlling the page now by calling clients.claim(). We should not send
+    // the actual request to the SW. https://crbug.com/604583
+    actualRequest.setSkipServiceWorker(true);
+
     loadRequest(actualRequest, actualOptions);
     // |this| may be dead here in async mode.
 }
 
 void DocumentThreadableLoader::handlePreflightFailure(const String& url, const String& errorDescription)
 {
     ResourceError error(errorDomainBlinkInternal, 0, url, errorDescription);
 
     // Prevent handleSuccessfulFinish() from bypassing access check.
     m_actualRequest = ResourceRequest();
@@ skipping 146 matching lines @@
     return m_securityOrigin ? m_securityOrigin.get() : document().getSecurityOrigin();
 }
 
 Document& DocumentThreadableLoader::document() const
 {
     ASSERT(m_document);
     return *m_document;
 }
 
 } // namespace blink