Allow XHR timeout attribute to be overridden after send(), per spec

Source/core/loader/WorkerThreadableLoader.cpp

 /*
  * Copyright (C) 2009, 2010 Google Inc. All rights reserved.
  *
  * 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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 77 matching lines @@
         signalled = blink::Platform::current()->waitMultipleEvents(events);
     }
     if (signalled == shutdownEvent) {
         loader->cancel();
         return;
     }
 
     clientBridgePtr->run();
 }
 
+void WorkerThreadableLoader::overrideTimeout(unsigned long timeoutMilliseconds)
+{
+    m_bridge.overrideTimeout(timeoutMilliseconds);
+}
+
 void WorkerThreadableLoader::cancel()
 {
     m_bridge.cancel();
 }
 
 WorkerThreadableLoader::MainThreadBridge::MainThreadBridge(
     PassRefPtr<ThreadableLoaderClientWrapper> workerClientWrapper,
     PassOwnPtr<ThreadableLoaderClient> clientBridge,
     WorkerLoaderProxy& loaderProxy,
     const ResourceRequest& request, const ThreadableLoaderOptions& options, const String& outgoingReferrer)
@@ skipping 37 matching lines @@
 void WorkerThreadableLoader::MainThreadBridge::destroy()
 {
     // Ensure that no more client callbacks are done in the worker context's thread.
     clearClientWrapper();
 
     // "delete this" and m_mainThreadLoader::deref() on the worker object's thread.
     m_loaderProxy.postTaskToLoader(
         createCallbackTask(&MainThreadBridge::mainThreadDestroy, AllowCrossThreadAccess(this)));
 }
 
+void WorkerThreadableLoader::MainThreadBridge::mainThreadOverrideTimeout(ExecutionContext* context, MainThreadBridge* thisPtr, unsigned long timeoutMilliseconds)
+{
+    ASSERT(isMainThread());
+    ASSERT_UNUSED(context, context->isDocument());
+
+    if (!thisPtr->m_mainThreadLoader)
+        return;
+    thisPtr->m_mainThreadLoader->overrideTimeout(timeoutMilliseconds);
+}
+
 void WorkerThreadableLoader::MainThreadBridge::mainThreadCancel(ExecutionContext* context, MainThreadBridge* thisPtr)
 {
     ASSERT(isMainThread());
     ASSERT_UNUSED(context, context->isDocument());
 
     if (!thisPtr->m_mainThreadLoader)
         return;
     thisPtr->m_mainThreadLoader->cancel();
     thisPtr->m_mainThreadLoader = nullptr;
 }
 
+void WorkerThreadableLoader::MainThreadBridge::overrideTimeout(unsigned long timeoutMilliseconds)

[tyoshino (SeeGerritForStatus), 2014/05/12 09:21:17]

please move this definition to between l168 and l170 since currently they're
organized as a list like mainThreadFoo, foo, mainThreadBar, bar, ...

+{
+    m_loaderProxy.postTaskToLoader(
+        createCallbackTask(&MainThreadBridge::mainThreadOverrideTimeout, AllowCrossThreadAccess(this),
+            timeoutMilliseconds));
+}
+
 void WorkerThreadableLoader::MainThreadBridge::cancel()
 {
     m_loaderProxy.postTaskToLoader(
         createCallbackTask(&MainThreadBridge::mainThreadCancel, AllowCrossThreadAccess(this)));
     ThreadableLoaderClientWrapper* clientWrapper = m_workerClientWrapper.get();
     if (!clientWrapper->done()) {
         // If the client hasn't reached a termination state, then transition it by sending a cancellation error.
         // Note: no more client callbacks will be done after this method -- the clearClientWrapper() call ensures that.
         ResourceError error(String(), 0, String(), String());
         error.setIsCancellation(true);
@@ skipping 46 matching lines @@
 {
     m_clientBridge->didFailAccessControlCheck(error);
 }
 
 void WorkerThreadableLoader::MainThreadBridge::didFailRedirectCheck()
 {
     m_clientBridge->didFailRedirectCheck();
 }
 
 } // namespace WebCore