Refactoring starting a resource load

third_party/WebKit/Source/core/fetch/ResourceLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2010, 2011 Apple Inc. All rights reserved.
  *           (C) 2007 Graham Dennis (graham.dennis@gmail.com)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 40 matching lines @@
 {
     return new ResourceLoader(fetcher, resource);
 }
 
 ResourceLoader::ResourceLoader(ResourceFetcher* fetcher, Resource* resource)
     : m_fetcher(fetcher)
     , m_resource(resource)
 {
     ASSERT(m_resource);
     ASSERT(m_fetcher);
+    m_resource->setLoader(this);
 }
 
 ResourceLoader::~ResourceLoader()
 {
     DCHECK(!m_loader);
 }
 
 DEFINE_TRACE(ResourceLoader)
 {
     visitor->trace(m_fetcher);
     visitor->trace(m_resource);
 }
 
-void ResourceLoader::start(ResourceRequest& request)
+void ResourceLoader::start(const ResourceRequest& request, WebTaskRunner* loadingTaskRunner, bool defersLoading)
 {
     ASSERT(!m_loader);
+    if (m_resource->options().synchronousPolicy == RequestSynchronously && defersLoading) {
+        cancel();
+        return;
+    }
 
-    m_fetcher->willStartLoadingResource(m_resource.get(), this, request);
     m_loader = adoptPtr(Platform::current()->createURLLoader());
-    m_loader->setDefersLoading(m_fetcher->defersLoading());
+    m_loader->setDefersLoading(defersLoading);
     ASSERT(m_loader);
-    m_loader->setLoadingTaskRunner(m_fetcher->loadingTaskRunner());
+    m_loader->setLoadingTaskRunner(loadingTaskRunner);
 
     if (m_resource->options().synchronousPolicy == RequestSynchronously)
         requestSynchronously(request);
     else
         m_loader->loadAsynchronously(WrappedResourceRequest(request), this);
 }
 
 void ResourceLoader::setDefersLoading(bool defers)
 {
     ASSERT(m_loader);
@@ skipping 116 matching lines @@
     m_loader.reset();
     m_fetcher->didFinishLoading(m_resource.get(), finishTime, encodedDataLength, ResourceFetcher::DidFinishLoading);
 }
 
 void ResourceLoader::didFail(WebURLLoader*, const WebURLError& error)
 {
     m_loader.reset();
     m_fetcher->didFailLoading(m_resource.get(), error);
 }
 
-void ResourceLoader::requestSynchronously(ResourceRequest& request)
+void ResourceLoader::requestSynchronously(const ResourceRequest& request)
 {
     // downloadToFile is not supported for synchronous requests.
     ASSERT(!request.downloadToFile());
     ASSERT(m_loader);
-
-    // Synchronous requests should always be max priority, lest they hang the renderer.
-    request.setPriority(ResourceLoadPriorityHighest);
-
-    if (m_fetcher->defersLoading()) {
-        cancel();
-        return;
-    }
+    DCHECK(request.priority() == ResourceLoadPriorityHighest);
 
     WrappedResourceRequest requestIn(request);
     WebURLResponse responseOut;
     responseOut.initialize();
     WebURLError errorOut;
     WebData dataOut;
     m_loader->loadSynchronously(requestIn, responseOut, errorOut, dataOut);
 
     // A message dispatched while synchronously fetching the resource
     // can bring about the cancellation of this load.
@@ skipping 14 matching lines @@
     // empty buffer is a noop in most cases, but is destructive in the case of
     // a 304, where it will overwrite the cached data we should be reusing.
     if (dataOut.size()) {
         m_fetcher->didReceiveData(m_resource.get(), dataOut.data(), dataOut.size(), encodedDataLength);
         m_resource->setResourceBuffer(dataOut);
     }
     didFinishLoading(0, monotonicallyIncreasingTime(), encodedDataLength);
 }
 
 } // namespace blink