Merge MainResourceLoader's SubstituteData loading + others into DocumentLoader
[WebKit-https.git] / Source / WebCore / ChangeLog
index 5b4d6ddf73ad69f1ddb97cdfa00ea4111b48b237..9520955c8d20eebc12150d120445c0efa16cd70a 100644 (file)
@@ -1,3 +1,39 @@
+2013-03-19  Nate Chapin  <japhet@chromium.org>
+
+        Merge MainResourceLoader's SubstituteData loading + others into DocumentLoader
+        https://bugs.webkit.org/show_bug.cgi?id=112722
+
+        Part of the ongoing effort to merge MainResourceLoader entirely
+        into DocumentLoader.
+
+        Reviewed by Antti Koivisto.
+
+        No new tests, refactor only.
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::mainReceivedError): Moved from MainResourceLoader::receivedError
+            and the failure case in MainResourceLoader::notifyFinished.
+        (WebCore::DocumentLoader::stopLoading):
+        (WebCore::DocumentLoader::finishedLoading):
+        (WebCore::DocumentLoader::handleSubstituteDataLoadNow): Moved from MainResourceLoader.
+        (WebCore::DocumentLoader::startDataLoadTimer): Moved from MainResourceLoader.
+        (WebCore::DocumentLoader::handleSubstituteDataLoadSoon): Moved from MainResourceLoader.
+        (WebCore::DocumentLoader::willSendRequest):
+        (WebCore::DocumentLoader::continueAfterNavigationPolicy):
+        (WebCore::DocumentLoader::responseReceived):
+        (WebCore::DocumentLoader::receivedData):
+        (WebCore::DocumentLoader::startLoadingMainResource): Most of MainResourceLoader::load
+            moved here.
+        (WebCore::DocumentLoader::cancelMainResourceLoad): MainResourceLoader::cancel
+            moved here.
+        * loader/DocumentLoader.h:
+        * loader/MainResourceLoader.cpp:
+        (WebCore::MainResourceLoader::notifyFinished):
+        (WebCore::MainResourceLoader::reportMemoryUsage):
+        (WebCore::MainResourceLoader::load):
+        (WebCore::MainResourceLoader::identifier):
+        * loader/MainResourceLoader.h:
+
 2013-03-19  Ryosuke Niwa  <rniwa@webkit.org>
 
         Unreviewed build fix after r146220. Add the missing ]'s.