Stop having separate timeout timers for the preflight and the actual request

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 882 matching lines @@
   } else {
     handleSuccessfulFinish(resource->identifier(), resource->loadFinishTime());
   }
 }
 
 void DocumentThreadableLoader::handleSuccessfulFinish(unsigned long identifier,
                                                       double finishTime) {
   DCHECK(m_fallbackRequestForServiceWorker.isNull());
 
   if (!m_actualRequest.isNull()) {
-    // FIXME: Timeout should be applied to whole fetch, not for each of
-    // preflight and actual request.
-    m_timeoutTimer.stop();
     DCHECK(!m_sameOriginRequest);
     DCHECK_EQ(m_options.crossOriginRequestPolicy, UseAccessControl);
     loadActualRequest();
     return;
   }
 
   ThreadableLoaderClient* client = m_client;
   // Protect the resource in |didFinishLoading| in order not to release the
   // downloaded file.
   Persistent<Resource> protect = resource();
@@ skipping 65 matching lines @@
   clear();
   client->didFail(error);
 }
 
 void DocumentThreadableLoader::loadRequestAsync(
     const ResourceRequest& request,
     ResourceLoaderOptions resourceLoaderOptions) {
   if (!m_actualRequest.isNull())
     resourceLoaderOptions.dataBufferingPolicy = BufferData;
 
-  if (m_options.timeoutMilliseconds > 0) {
+  // The timer can be active if this is the actual request of a
+  // CORS-with-preflight request.
+  if (m_options.timeoutMilliseconds > 0 && !m_timeoutTimer.isActive()) {
     m_timeoutTimer.startOneShot(m_options.timeoutMilliseconds / 1000.0,
                                 BLINK_FROM_HERE);
   }
 
   FetchRequest newRequest(request, m_options.initiator, resourceLoaderOptions);
   if (m_options.crossOriginRequestPolicy == AllowCrossOriginRequests)
     newRequest.setOriginRestriction(FetchRequest::NoOriginRestriction);
   DCHECK(!resource());
 
   ResourceFetcher* fetcher = m_loadingContext->getResourceFetcher();
@@ skipping 143 matching lines @@
 }
 
 DEFINE_TRACE(DocumentThreadableLoader) {
   visitor->trace(m_resource);
   visitor->trace(m_loadingContext);
   ThreadableLoader::trace(visitor);
   RawResourceClient::trace(visitor);
 }
 
 }  // namespace blink