-
rniwa@webkit.org authored
https://bugs.webkit.org/show_bug.cgi?id=104969 Patch by Nate Chapin <japhet@chromium.org> on 2013-03-21 Reviewed by Adam Barth. No new tests, refactor only. * CMakeLists.txt: * GNUmakefile.list.am: * Target.pri: * WebCore.exp.in: * WebCore.gypi: * WebCore.vcproj/WebCore.vcproj: * WebCore.vcxproj/WebCore.vcxproj: * WebCore.vcxproj/WebCore.vcxproj.filters: * WebCore.xcodeproj/project.pbxproj: * loader/DocumentLoader.cpp: (WebCore::DocumentLoader::DocumentLoader): (WebCore::DocumentLoader::mainResourceLoader): (WebCore::DocumentLoader::~DocumentLoader): Move main resource clearing from ~MainResourceLoader. (WebCore::DocumentLoader::mainResourceData): (WebCore::DocumentLoader::stopLoading): (WebCore::DocumentLoader::notifyFinished): Moved from MainResourceLoader::notifyFinished. (WebCore): (WebCore::DocumentLoader::finishedLoading): (WebCore::DocumentLoader::handleSubstituteDataLoadNow): (WebCore::DocumentLoader::redirectReceived): (WebCore::DocumentLoader::continueAfterNavigationPolicy): (WebCore::DocumentLoader::responseReceived): (WebCore::DocumentLoader::continueAfterContentPolicy): (WebCore::DocumentLoader::reportMemoryUsage): (WebCore::DocumentLoader::dataReceived): (WebCore::DocumentLoader::clearMainResourceLoader): (WebCore::DocumentLoader::setDefersLoading): (WebCore::DocumentLoader::setMainResourceDataBufferingPolicy): (WebCore::DocumentLoader::addSubresourceLoader): (WebCore::DocumentLoader::maybeLoadEmpty): (WebCore::DocumentLoader::startLoadingMainResource): Don't keep separate checks for normal and empty loads, just use a single boolean. * loader/DocumentLoader.h: (WebCore::DocumentLoader::isLoadingMainResource): * loader/MainResourceLoader.cpp: Removed. * loader/MainResourceLoader.h: Removed. * loader/mac/DocumentLoaderMac.cpp: (WebCore::DocumentLoader::schedule): (WebCore::DocumentLoader::unschedule): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146449 268f45cc-cd09-0410-ab3c-d52691b4dbfc
b1242489