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 74 matching lines @@
 
     ASSERT(m_state != ConnectionStateReleased);
     m_state = ConnectionStateReleased;
     if (m_loader) {
         m_loader->cancel();
         m_loader.clear();
     }
     m_fetcher.clear();
 }
 
-void ResourceLoader::start(ResourceRequest& request)
+void ResourceLoader::start(ResourceRequest& request, WebTaskRunner* loadingTaskRunner, bool defersLoading)
 {
     ASSERT(!m_loader);
-
-    m_fetcher->willStartLoadingResource(m_resource.get(), this, request);
     RELEASE_ASSERT(m_state == ConnectionStateNew);
     m_state = ConnectionStateStarted;
 
+    if (m_resource->options().synchronousPolicy == RequestSynchronously && defersLoading) {

[Yoav Weiss, 2016/04/20 08:52:08]

Does that constitute a behavior change? I may be reading this wrong, but seems
to me like sync requests were sent before and are not sent now.

[Nate Chapin, 2016/05/18 23:56:04]

No behavior change. I moved this from requestSynchronously() below, so that we
don't also have to pass the defersLoading bool to requestSynchronously.

+        cancel();
+        return;
+    }
+
     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 252 matching lines @@
 
 void ResourceLoader::requestSynchronously(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;
-    }
-
     WrappedResourceRequest requestIn(request);
     WebURLResponse responseOut;
     responseOut.initialize();
     WebURLError errorOut;
     WebData dataOut;
     m_loader->loadSynchronously(requestIn, responseOut, errorOut, dataOut);
     if (errorOut.reason) {
         if (m_state == ConnectionStateReleased) {
             // 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