Move WebAssociatedURLLoaderImpl's error timer to the frame's loading task runner.

third_party/WebKit/Source/web/WebAssociatedURLLoaderImpl.cpp

 /*
  * Copyright (C) 2010, 2011, 2012 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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "web/WebAssociatedURLLoaderImpl.h"
 
 #include "core/dom/ContextLifecycleObserver.h"
+#include "core/dom/TaskRunnerHelper.h"
 #include "core/fetch/CrossOriginAccessControl.h"
 #include "core/fetch/FetchUtils.h"
 #include "core/loader/DocumentThreadableLoader.h"
 #include "core/loader/DocumentThreadableLoaderClient.h"
 #include "platform/Timer.h"
 #include "platform/exported/WrappedResourceRequest.h"
 #include "platform/exported/WrappedResourceResponse.h"
 #include "platform/network/HTTPParsers.h"
 #include "platform/network/ResourceError.h"
 #include "public/platform/WebHTTPHeaderVisitor.h"
@@ skipping 41 matching lines @@
 // It forwards its ThreadableLoaderClient notifications to a
 // WebAssociatedURLLoaderClient.
 class WebAssociatedURLLoaderImpl::ClientAdapter final
     : public DocumentThreadableLoaderClient {
   WTF_MAKE_NONCOPYABLE(ClientAdapter);
 
  public:
   static std::unique_ptr<ClientAdapter> create(
       WebAssociatedURLLoaderImpl*,
       WebAssociatedURLLoaderClient*,
-      const WebAssociatedURLLoaderOptions&);
+      const WebAssociatedURLLoaderOptions&,
+      RefPtr<WebTaskRunner>);
 
   // ThreadableLoaderClient
   void didSendData(unsigned long long /*bytesSent*/,
                    unsigned long long /*totalBytesToBeSent*/) override;
   void didReceiveResponse(unsigned long,
                           const ResourceResponse&,
                           std::unique_ptr<WebDataConsumerHandle>) override;
   void didDownloadData(int /*dataLength*/) override;
   void didReceiveData(const char*, unsigned /*dataLength*/) override;
   void didReceiveCachedMetadata(const char*, int /*dataLength*/) override;
@@ skipping 20 matching lines @@
   // possible.
   WebAssociatedURLLoaderClient* releaseClient() {
     WebAssociatedURLLoaderClient* client = m_client;
     m_client = nullptr;
     return client;
   }
 
  private:
   ClientAdapter(WebAssociatedURLLoaderImpl*,
                 WebAssociatedURLLoaderClient*,
-                const WebAssociatedURLLoaderOptions&);
+                const WebAssociatedURLLoaderOptions&,
+                RefPtr<WebTaskRunner>);
 
   void notifyError(TimerBase*);
 
   WebAssociatedURLLoaderImpl* m_loader;
   WebAssociatedURLLoaderClient* m_client;
   WebAssociatedURLLoaderOptions m_options;
   WebURLError m_error;
 
-  Timer<ClientAdapter> m_errorTimer;
+  TaskRunnerTimer<ClientAdapter> m_errorTimer;
   bool m_enableErrorNotifications;
   bool m_didFail;
 };
 
 std::unique_ptr<WebAssociatedURLLoaderImpl::ClientAdapter>
 WebAssociatedURLLoaderImpl::ClientAdapter::create(
     WebAssociatedURLLoaderImpl* loader,
     WebAssociatedURLLoaderClient* client,
-    const WebAssociatedURLLoaderOptions& options) {
-  return WTF::wrapUnique(new ClientAdapter(loader, client, options));
+    const WebAssociatedURLLoaderOptions& options,
+    RefPtr<WebTaskRunner> taskRunner) {
+  return WTF::wrapUnique(
+      new ClientAdapter(loader, client, options, taskRunner));
 }
 
 WebAssociatedURLLoaderImpl::ClientAdapter::ClientAdapter(
     WebAssociatedURLLoaderImpl* loader,
     WebAssociatedURLLoaderClient* client,
-    const WebAssociatedURLLoaderOptions& options)
+    const WebAssociatedURLLoaderOptions& options,
+    RefPtr<WebTaskRunner> taskRunner)
     : m_loader(loader),
       m_client(client),
       m_options(options),
-      m_errorTimer(this, &ClientAdapter::notifyError),
+      m_errorTimer(std::move(taskRunner), this, &ClientAdapter::notifyError),
       m_enableErrorNotifications(false),
       m_didFail(false) {
   DCHECK(m_loader);
   DCHECK(m_client);
 }
 
 bool WebAssociatedURLLoaderImpl::ClientAdapter::willFollowRedirect(
     const ResourceRequest& newRequest,
     const ResourceResponse& redirectResponse) {
   if (!m_client)
@@ skipping 199 matching lines @@
     allowLoad = m_observer && isValidHTTPToken(method) &&
                 FetchUtils::isUsefulMethod(method);
     if (allowLoad) {
       newRequest.setHTTPMethod(FetchUtils::normalizeMethod(method));
       HTTPRequestHeaderValidator validator;
       newRequest.visitHTTPHeaderFields(&validator);
       allowLoad = validator.isSafe();
     }
   }
 
+  RefPtr<WebTaskRunner> taskRunner = TaskRunnerHelper::get(
+      TaskType::UnspecedLoading,
+      m_observer ? toDocument(m_observer->lifecycleContext()) : nullptr);
   m_client = client;
-  m_clientAdapter = ClientAdapter::create(this, client, m_options);
+  m_clientAdapter =
+      ClientAdapter::create(this, client, m_options, std::move(taskRunner));
 
   if (allowLoad) {
     ThreadableLoaderOptions options;
     options.preflightPolicy =
         static_cast<PreflightPolicy>(m_options.preflightPolicy);
     options.crossOriginRequestPolicy = static_cast<CrossOriginRequestPolicy>(
         m_options.crossOriginRequestPolicy);
 
     ResourceLoaderOptions resourceLoaderOptions;
     resourceLoaderOptions.allowCredentials = m_options.allowCredentials
@@ skipping 92 matching lines @@
   // there could be a WebURLLoader instance behind the
   // DocumentThreadableLoader instance. So, for safety, we chose to just
   // crash here.
   CHECK(ThreadState::current());
 
   m_observer->dispose();
   m_observer = nullptr;
 }
 
 }  // namespace blink