Commit 1d734efa authored by mjs's avatar mjs

Rubber stamped by Darin.

        - renamed ResourceLoader to ResourceHandle (and same for related classes)

        * CMakeLists.txt:
        * Projects/gdk/webcore-gdk.bkl:
        * WebCore.vcproj/WebCore/WebCore.vcproj:
        * WebCore.xcodeproj/project.pbxproj:
        * WebCoreSources.bkl:
        * bridge/mac/FrameMac.mm:
        * bridge/win/FrameWin.cpp:
        * dom/XMLTokenizer.cpp:
        * loader/Cache.cpp:
        * loader/CachedResource.h:
        * loader/LoaderFunctions.h:
        * loader/icon/IconLoader.cpp:
        (IconLoader::startLoading):
        (IconLoader::didReceiveData):
        (IconLoader::didFinishLoading):
        * loader/icon/IconLoader.h:
        * loader/loader.cpp:
        (WebCore::Loader::servePendingRequests):
        (WebCore::Loader::receivedAllData):
        (WebCore::Loader::receivedResponse):
        (WebCore::Loader::didReceiveData):
        (WebCore::Loader::cancelRequests):
        (WebCore::Loader::jobForRequest):
        * loader/loader.h:
        * loader/mac/IconLoaderMac.mm:
        (IconLoader::receivedResponse):
        * loader/mac/LoaderFunctionsMac.mm:
        * loader/mac/WebLoader.h:
        * loader/mac/WebSubresourceLoader.h:
        * loader/mac/WebSubresourceLoader.mm:
        (WebCore::SubresourceLoader::SubresourceLoader):
        (WebCore::SubresourceLoader::create):
        * platform/gdk/FrameGdk.cpp:
        (WebCore::FrameGdkClientDefault::FrameGdkClientDefault):
        (WebCore::FrameGdkClientDefault::openURL):
        (WebCore::FrameGdkClientDefault::submitForm):
        (WebCore::FrameGdkClientDefault::receivedResponse):
        (WebCore::FrameGdkClientDefault::didReceiveData):
        (WebCore::FrameGdkClientDefault::receivedAllData):
        * platform/gdk/FrameGdk.h:
        * platform/gdk/TemporaryLinkStubs.cpp:
        (WebCore::ServeSynchronousRequest):
        (WebCore::ResourceHandle::assembleResponseHeaders):
        (WebCore::ResourceHandle::retrieveCharset):
        * platform/network/ResourceHandle.cpp: Added.
        (WebCore::ResourceHandle::ResourceHandle):
        (WebCore::ResourceHandle::create):
        (WebCore::ResourceHandle::isErrorPage):
        (WebCore::ResourceHandle::error):
        (WebCore::ResourceHandle::setError):
        (WebCore::ResourceHandle::responseEncoding):
        (WebCore::ResourceHandle::responseHTTPHeadersAsString):
        (WebCore::ResourceHandle::kill):
        (WebCore::ResourceHandle::requestHeaders):
        (WebCore::ResourceHandle::url):
        (WebCore::ResourceHandle::postData):
        (WebCore::ResourceHandle::method):
        (WebCore::ResourceHandle::client):
        * platform/network/ResourceHandle.h: Added.
        (WebCore::ResourceHandle::getInternal):
        * platform/network/ResourceHandleClient.h: Added.
        (WebCore::ResourceHandleClient::~ResourceHandleClient):
        (WebCore::ResourceHandleClient::didReceiveData):
        (WebCore::ResourceHandleClient::didFinishLoading):
        (WebCore::ResourceHandleClient::receivedRedirect):
        (WebCore::ResourceHandleClient::receivedResponse):
        (WebCore::ResourceHandleClient::receivedAllData):
        * platform/network/ResourceHandleInternal.h: Added.
        (WebCore::ResourceHandleInternal::ResourceHandleInternal):
        * platform/network/ResourceLoader.cpp: Removed.
        * platform/network/ResourceLoader.h: Removed.
        * platform/network/ResourceLoaderClient.h: Removed.
        * platform/network/ResourceLoaderInternal.h: Removed.
        * platform/network/cf/ResourceHandleCFNet.cpp: Added.
        (WebCore::willSendRequest):
        (WebCore::didReceiveResponse):
        (WebCore::didReceiveData):
        (WebCore::didFinishLoading):
        (WebCore::didFail):
        (WebCore::willCacheResponse):
        (WebCore::didReceiveChallenge):
        (WebCore::ResourceHandleInternal::~ResourceHandleInternal):
        (WebCore::ResourceHandle::~ResourceHandle):
        (WebCore::ResourceHandle::start):
        (WebCore::ResourceHandle::cancel):
        * platform/network/cf/ResourceLoaderCFNet.cpp: Removed.
        * platform/network/gdk/ResourceHandleCurl.cpp: Added.
        (WebCore::ResourceHandleInternal::~ResourceHandleInternal):
        (WebCore::ResourceHandle::~ResourceHandle):
        (WebCore::ResourceHandle::start):
        (WebCore::ResourceHandle::cancel):
        * platform/network/gdk/ResourceHandleManager.cpp: Added.
        (WebCore::ResourceHandleManager::ResourceHandleManager):
        (WebCore::ResourceHandleManager::get):
        (WebCore::ResourceHandleManager::useSimpleTransfer):
        (WebCore::writeCallback):
        (WebCore::ResourceHandleManager::downloadTimerCallback):
        (WebCore::ResourceHandleManager::remove):
        (WebCore::ResourceHandleManager::add):
        (WebCore::ResourceHandleManager::cancel):
        * platform/network/gdk/ResourceHandleManager.h: Added.
        * platform/network/gdk/ResourceLoaderCurl.cpp: Removed.
        * platform/network/gdk/ResourceLoaderManager.cpp: Removed.
        * platform/network/gdk/ResourceLoaderManager.h: Removed.
        * platform/network/mac/ResourceHandleMac.mm: Added.
        (WebCore::ResourceHandleInternal::~ResourceHandleInternal):
        (WebCore::ResourceHandle::~ResourceHandle):
        (WebCore::ResourceHandle::start):
        (WebCore::ResourceHandle::assembleResponseHeaders):
        (WebCore::ResourceHandle::retrieveResponseEncoding):
        (WebCore::ResourceHandle::receivedResponse):
        (WebCore::ResourceHandle::cancel):
        (WebCore::ResourceHandle::redirectedToURL):
        (WebCore::ResourceHandle::addData):
        (WebCore::ResourceHandle::finishJobAndHandle):
        (WebCore::ResourceHandle::reportError):
        * platform/network/mac/ResourceLoaderMac.mm: Removed.
        * platform/network/qt/ResourceHandleManager.cpp: Added.
        (WebCore::ResourceHandleManager::ResourceHandleManager):
        (WebCore::ResourceHandleManager::~ResourceHandleManager):
        (WebCore::ResourceHandleManager::self):
        (WebCore::ResourceHandleManager::slotData):
        (WebCore::ResourceHandleManager::slotMimetype):
        (WebCore::ResourceHandleManager::slotResult):
        (WebCore::ResourceHandleManager::remove):
        (WebCore::ResourceHandleManager::add):
        (WebCore::ResourceHandleManager::cancel):
        * platform/network/qt/ResourceHandleManager.h: Added.
        * platform/network/qt/ResourceHandleQt.cpp: Added.
        (WebCore::ResourceHandleInternal::~ResourceHandleInternal):
        (WebCore::ResourceHandle::~ResourceHandle):
        (WebCore::ResourceHandle::start):
        (WebCore::ResourceHandle::cancel):
        (WebCore::ResourceHandle::assembleResponseHeaders):
        (WebCore::ResourceHandle::retrieveResponseEncoding):
        (WebCore::ResourceHandle::receivedResponse):
        (WebCore::ResourceHandle::extractCharsetFromHeaders):
        * platform/network/qt/ResourceLoaderManager.cpp: Removed.
        * platform/network/qt/ResourceLoaderManager.h: Removed.
        * platform/network/qt/ResourceLoaderQt.cpp: Removed.
        * platform/network/win/ResourceHandleWin.cpp: Added.
        (WebCore::):
        (WebCore::addToOutstandingJobs):
        (WebCore::lookupResourceHandle):
        (WebCore::ResourceHandleWndProc):
        (WebCore::initializeOffScreenResourceHandleWindow):
        (WebCore::ResourceHandleInternal::~ResourceHandleInternal):
        (WebCore::ResourceHandle::~ResourceHandle):
        (WebCore::ResourceHandle::onHandleCreated):
        (WebCore::ResourceHandle::onRequestRedirected):
        (WebCore::ResourceHandle::onRequestComplete):
        (WebCore::ResourceHandle::start):
        (WebCore::ResourceHandle::fileLoadTimer):
        (WebCore::ResourceHandle::cancel):
        (WebCore::ResourceHandle::setHasReceivedResponse):
        (WebCore::ResourceHandle::hasReceivedResponse):
        * platform/network/win/ResourceHandleWin.h: Added.
        * platform/network/win/ResourceLoaderWin.cpp: Removed.
        * platform/network/win/ResourceLoaderWin.h: Removed.
        * platform/qt/FrameQt.cpp:
        * platform/qt/FrameQtClient.cpp:
        (WebCore::FrameQtClientDefault::openURL):
        (WebCore::FrameQtClientDefault::submitForm):
        (WebCore::FrameQtClientDefault::receivedResponse):
        (WebCore::FrameQtClientDefault::didReceiveData):
        (WebCore::FrameQtClientDefault::receivedAllData):
        * platform/qt/FrameQtClient.h:
        * platform/win/TemporaryLinkStubs.cpp:
        (WebCore::ResourceHandle::assembleResponseHeaders):
        (WebCore::ResourceHandle::retrieveResponseEncoding):
        (WebCore::ServeSynchronousRequest):
        * xml/XSLTProcessor.cpp:
        * xml/xmlhttprequest.cpp:
        (WebCore::XMLHttpRequest::send):
        (WebCore::XMLHttpRequest::didFinishLoading):
        (WebCore::XMLHttpRequest::receivedRedirect):
        (WebCore::XMLHttpRequest::didReceiveData):
        * xml/xmlhttprequest.h:



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@17410 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent b7da6cbc
......@@ -64,7 +64,7 @@ ENDIF(__KDE_HAVE_WVARIADIC_MACROS)
kde4_automoc(WebCore platform/qt/SharedTimerQt.cpp)
kde4_automoc(WebCore platform/qt/ScrollViewCanvasQt.cpp)
kde4_automoc(WebCore platform/network/qt/ResourceLoaderManager.cpp)
kde4_automoc(WebCore platform/network/qt/ResourceHandleManager.cpp)
SET(FEATURE_DEFINES_JAVASCRIPT LANGUAGE_JAVASCRIPT)
......@@ -1014,7 +1014,7 @@ set(WebCore_SRCS
platform/KURL.cpp
platform/StringImpl.cpp
platform/FloatRect.cpp
platform/network/ResourceLoader.cpp
platform/network/ResourceHandle.cpp
platform/Path.cpp
platform/qt/EditorClientQt.cpp
platform/qt/SoundQt.cpp
......@@ -1037,8 +1037,8 @@ set(WebCore_SRCS
platform/qt/FontDataQt.cpp
platform/qt/SharedTimerQt.cpp
platform/qt/PopupMenuQt.cpp
platform/network/qt/ResourceLoaderManager.cpp
platform/network/qt/ResourceLoaderQt.cpp
platform/network/qt/ResourceHandleManager.cpp
platform/network/qt/ResourceHandleQt.cpp
platform/qt/FloatPointQt.cpp
platform/qt/ListBoxQt.cpp
platform/qt/FloatRectQt.cpp
......
2006-10-29 Maciej Stachowiak <mjs@apple.com>
Rubber stamped by Darin.
- renamed ResourceLoader to ResourceHandle (and same for related classes)
* CMakeLists.txt:
* Projects/gdk/webcore-gdk.bkl:
* WebCore.vcproj/WebCore/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* WebCoreSources.bkl:
* bridge/mac/FrameMac.mm:
* bridge/win/FrameWin.cpp:
* dom/XMLTokenizer.cpp:
* loader/Cache.cpp:
* loader/CachedResource.h:
* loader/LoaderFunctions.h:
* loader/icon/IconLoader.cpp:
(IconLoader::startLoading):
(IconLoader::didReceiveData):
(IconLoader::didFinishLoading):
* loader/icon/IconLoader.h:
* loader/loader.cpp:
(WebCore::Loader::servePendingRequests):
(WebCore::Loader::receivedAllData):
(WebCore::Loader::receivedResponse):
(WebCore::Loader::didReceiveData):
(WebCore::Loader::cancelRequests):
(WebCore::Loader::jobForRequest):
* loader/loader.h:
* loader/mac/IconLoaderMac.mm:
(IconLoader::receivedResponse):
* loader/mac/LoaderFunctionsMac.mm:
* loader/mac/WebLoader.h:
* loader/mac/WebSubresourceLoader.h:
* loader/mac/WebSubresourceLoader.mm:
(WebCore::SubresourceLoader::SubresourceLoader):
(WebCore::SubresourceLoader::create):
* platform/gdk/FrameGdk.cpp:
(WebCore::FrameGdkClientDefault::FrameGdkClientDefault):
(WebCore::FrameGdkClientDefault::openURL):
(WebCore::FrameGdkClientDefault::submitForm):
(WebCore::FrameGdkClientDefault::receivedResponse):
(WebCore::FrameGdkClientDefault::didReceiveData):
(WebCore::FrameGdkClientDefault::receivedAllData):
* platform/gdk/FrameGdk.h:
* platform/gdk/TemporaryLinkStubs.cpp:
(WebCore::ServeSynchronousRequest):
(WebCore::ResourceHandle::assembleResponseHeaders):
(WebCore::ResourceHandle::retrieveCharset):
* platform/network/ResourceHandle.cpp: Added.
(WebCore::ResourceHandle::ResourceHandle):
(WebCore::ResourceHandle::create):
(WebCore::ResourceHandle::isErrorPage):
(WebCore::ResourceHandle::error):
(WebCore::ResourceHandle::setError):
(WebCore::ResourceHandle::responseEncoding):
(WebCore::ResourceHandle::responseHTTPHeadersAsString):
(WebCore::ResourceHandle::kill):
(WebCore::ResourceHandle::requestHeaders):
(WebCore::ResourceHandle::url):
(WebCore::ResourceHandle::postData):
(WebCore::ResourceHandle::method):
(WebCore::ResourceHandle::client):
* platform/network/ResourceHandle.h: Added.
(WebCore::ResourceHandle::getInternal):
* platform/network/ResourceHandleClient.h: Added.
(WebCore::ResourceHandleClient::~ResourceHandleClient):
(WebCore::ResourceHandleClient::didReceiveData):
(WebCore::ResourceHandleClient::didFinishLoading):
(WebCore::ResourceHandleClient::receivedRedirect):
(WebCore::ResourceHandleClient::receivedResponse):
(WebCore::ResourceHandleClient::receivedAllData):
* platform/network/ResourceHandleInternal.h: Added.
(WebCore::ResourceHandleInternal::ResourceHandleInternal):
* platform/network/ResourceLoader.cpp: Removed.
* platform/network/ResourceLoader.h: Removed.
* platform/network/ResourceLoaderClient.h: Removed.
* platform/network/ResourceLoaderInternal.h: Removed.
* platform/network/cf/ResourceHandleCFNet.cpp: Added.
(WebCore::willSendRequest):
(WebCore::didReceiveResponse):
(WebCore::didReceiveData):
(WebCore::didFinishLoading):
(WebCore::didFail):
(WebCore::willCacheResponse):
(WebCore::didReceiveChallenge):
(WebCore::ResourceHandleInternal::~ResourceHandleInternal):
(WebCore::ResourceHandle::~ResourceHandle):
(WebCore::ResourceHandle::start):
(WebCore::ResourceHandle::cancel):
* platform/network/cf/ResourceLoaderCFNet.cpp: Removed.
* platform/network/gdk/ResourceHandleCurl.cpp: Added.
(WebCore::ResourceHandleInternal::~ResourceHandleInternal):
(WebCore::ResourceHandle::~ResourceHandle):
(WebCore::ResourceHandle::start):
(WebCore::ResourceHandle::cancel):
* platform/network/gdk/ResourceHandleManager.cpp: Added.
(WebCore::ResourceHandleManager::ResourceHandleManager):
(WebCore::ResourceHandleManager::get):
(WebCore::ResourceHandleManager::useSimpleTransfer):
(WebCore::writeCallback):
(WebCore::ResourceHandleManager::downloadTimerCallback):
(WebCore::ResourceHandleManager::remove):
(WebCore::ResourceHandleManager::add):
(WebCore::ResourceHandleManager::cancel):
* platform/network/gdk/ResourceHandleManager.h: Added.
* platform/network/gdk/ResourceLoaderCurl.cpp: Removed.
* platform/network/gdk/ResourceLoaderManager.cpp: Removed.
* platform/network/gdk/ResourceLoaderManager.h: Removed.
* platform/network/mac/ResourceHandleMac.mm: Added.
(WebCore::ResourceHandleInternal::~ResourceHandleInternal):
(WebCore::ResourceHandle::~ResourceHandle):
(WebCore::ResourceHandle::start):
(WebCore::ResourceHandle::assembleResponseHeaders):
(WebCore::ResourceHandle::retrieveResponseEncoding):
(WebCore::ResourceHandle::receivedResponse):
(WebCore::ResourceHandle::cancel):
(WebCore::ResourceHandle::redirectedToURL):
(WebCore::ResourceHandle::addData):
(WebCore::ResourceHandle::finishJobAndHandle):
(WebCore::ResourceHandle::reportError):
* platform/network/mac/ResourceLoaderMac.mm: Removed.
* platform/network/qt/ResourceHandleManager.cpp: Added.
(WebCore::ResourceHandleManager::ResourceHandleManager):
(WebCore::ResourceHandleManager::~ResourceHandleManager):
(WebCore::ResourceHandleManager::self):
(WebCore::ResourceHandleManager::slotData):
(WebCore::ResourceHandleManager::slotMimetype):
(WebCore::ResourceHandleManager::slotResult):
(WebCore::ResourceHandleManager::remove):
(WebCore::ResourceHandleManager::add):
(WebCore::ResourceHandleManager::cancel):
* platform/network/qt/ResourceHandleManager.h: Added.
* platform/network/qt/ResourceHandleQt.cpp: Added.
(WebCore::ResourceHandleInternal::~ResourceHandleInternal):
(WebCore::ResourceHandle::~ResourceHandle):
(WebCore::ResourceHandle::start):
(WebCore::ResourceHandle::cancel):
(WebCore::ResourceHandle::assembleResponseHeaders):
(WebCore::ResourceHandle::retrieveResponseEncoding):
(WebCore::ResourceHandle::receivedResponse):
(WebCore::ResourceHandle::extractCharsetFromHeaders):
* platform/network/qt/ResourceLoaderManager.cpp: Removed.
* platform/network/qt/ResourceLoaderManager.h: Removed.
* platform/network/qt/ResourceLoaderQt.cpp: Removed.
* platform/network/win/ResourceHandleWin.cpp: Added.
(WebCore::):
(WebCore::addToOutstandingJobs):
(WebCore::lookupResourceHandle):
(WebCore::ResourceHandleWndProc):
(WebCore::initializeOffScreenResourceHandleWindow):
(WebCore::ResourceHandleInternal::~ResourceHandleInternal):
(WebCore::ResourceHandle::~ResourceHandle):
(WebCore::ResourceHandle::onHandleCreated):
(WebCore::ResourceHandle::onRequestRedirected):
(WebCore::ResourceHandle::onRequestComplete):
(WebCore::ResourceHandle::start):
(WebCore::ResourceHandle::fileLoadTimer):
(WebCore::ResourceHandle::cancel):
(WebCore::ResourceHandle::setHasReceivedResponse):
(WebCore::ResourceHandle::hasReceivedResponse):
* platform/network/win/ResourceHandleWin.h: Added.
* platform/network/win/ResourceLoaderWin.cpp: Removed.
* platform/network/win/ResourceLoaderWin.h: Removed.
* platform/qt/FrameQt.cpp:
* platform/qt/FrameQtClient.cpp:
(WebCore::FrameQtClientDefault::openURL):
(WebCore::FrameQtClientDefault::submitForm):
(WebCore::FrameQtClientDefault::receivedResponse):
(WebCore::FrameQtClientDefault::didReceiveData):
(WebCore::FrameQtClientDefault::receivedAllData):
* platform/qt/FrameQtClient.h:
* platform/win/TemporaryLinkStubs.cpp:
(WebCore::ResourceHandle::assembleResponseHeaders):
(WebCore::ResourceHandle::retrieveResponseEncoding):
(WebCore::ServeSynchronousRequest):
* xml/XSLTProcessor.cpp:
* xml/xmlhttprequest.cpp:
(WebCore::XMLHttpRequest::send):
(WebCore::XMLHttpRequest::didFinishLoading):
(WebCore::XMLHttpRequest::receivedRedirect):
(WebCore::XMLHttpRequest::didReceiveData):
* xml/xmlhttprequest.h:
t2006-10-29 Darin Adler <darin@apple.com>
Reviewed by Maciej.
......@@ -78,7 +78,7 @@
platform/gdk/KeyEventGdk.cpp
platform/gdk/MouseEventGdk.cpp
platform/gdk/PageGdk.cpp
platform/network/gdk/ResourceLoaderManager.cpp
platform/network/gdk/ResourceHandleManager.cpp
platform/gdk/RenderThemeGdk.cpp
platform/gdk/RenderPopupMenuGdk.cpp
platform/gdk/ScreenGdk.cpp
......@@ -86,7 +86,7 @@
platform/gdk/SharedTimerLinux.cpp
platform/gdk/SystemTimeLinux.cpp
platform/gdk/TemporaryLinkStubs.cpp
platform/network/gdk/ResourceLoaderCurl.cpp
platform/network/gdk/ResourceHandleCurl.cpp
platform/gdk/WheelEventGdk.cpp
platform/gdk/WidgetGdk.cpp
</sources>
......
......@@ -1431,19 +1431,19 @@
>
</File>
<File
RelativePath="..\..\platform\ResourceLoader.cpp"
RelativePath="..\..\platform\ResourceHandle.cpp"
>
</File>
<File
RelativePath="..\..\platform\ResourceLoader.h"
RelativePath="..\..\platform\ResourceHandle.h"
>
</File>
<File
RelativePath="..\..\platform\ResourceLoaderClient.h"
RelativePath="..\..\platform\ResourceHandleClient.h"
>
</File>
<File
RelativePath="..\..\platform\ResourceLoaderInternal.h"
RelativePath="..\..\platform\ResourceHandleInternal.h"
>
</File>
<File
......@@ -1666,11 +1666,11 @@
>
</File>
<File
RelativePath="..\..\platform\win\ResourceLoaderWin.cpp"
RelativePath="..\..\platform\win\ResourceHandleWin.cpp"
>
</File>
<File
RelativePath="..\..\platform\win\ResourceLoaderWin.h"
RelativePath="..\..\platform\win\ResourceHandleWin.h"
>
</File>
<File
......
......@@ -315,11 +315,11 @@
6565820009D1508D000E61D7 /* SVGNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 656581E909D1508D000E61D7 /* SVGNames.h */; };
6565820209D1508D000E61D7 /* XLinkNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 656581EB09D1508D000E61D7 /* XLinkNames.h */; };
6565821309D15111000E61D7 /* ksvgcssvalues.h in Headers */ = {isa = PBXBuildFile; fileRef = 6565820F09D15111000E61D7 /* ksvgcssvalues.h */; };
656B84E00AEA1D3100A095B4 /* ResourceLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 656B84DC0AEA1D3100A095B4 /* ResourceLoader.cpp */; };
656B84E20AEA1D3100A095B4 /* ResourceLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 656B84DE0AEA1D3100A095B4 /* ResourceLoaderClient.h */; };
656B84E30AEA1D3100A095B4 /* ResourceLoaderInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 656B84DF0AEA1D3100A095B4 /* ResourceLoaderInternal.h */; };
656B84EB0AEA1DDA00A095B4 /* ResourceLoaderMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 656B84EA0AEA1DDA00A095B4 /* ResourceLoaderMac.mm */; };
656B85380AEA1F9A00A095B4 /* ResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 656B85370AEA1F9A00A095B4 /* ResourceLoader.h */; };
656B84E00AEA1D3100A095B4 /* ResourceHandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 656B84DC0AEA1D3100A095B4 /* ResourceHandle.cpp */; };
656B84E20AEA1D3100A095B4 /* ResourceHandleClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 656B84DE0AEA1D3100A095B4 /* ResourceHandleClient.h */; };
656B84E30AEA1D3100A095B4 /* ResourceHandleInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 656B84DF0AEA1D3100A095B4 /* ResourceHandleInternal.h */; };
656B84EB0AEA1DDA00A095B4 /* ResourceHandleMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 656B84EA0AEA1DDA00A095B4 /* ResourceHandleMac.mm */; };
656B85380AEA1F9A00A095B4 /* ResourceHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 656B85370AEA1F9A00A095B4 /* ResourceHandle.h */; };
656D37320ADBA5DE00A4554D /* LoaderNSURLExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D371A0ADBA5DE00A4554D /* LoaderNSURLExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
656D37330ADBA5DE00A4554D /* LoaderNSURLExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = 656D371B0ADBA5DE00A4554D /* LoaderNSURLExtras.m */; };
656D37340ADBA5DE00A4554D /* WebDataProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D371C0ADBA5DE00A4554D /* WebDataProtocol.h */; settings = {ATTRIBUTES = (Private, ); }; };
......@@ -3230,11 +3230,11 @@
6565820E09D15111000E61D7 /* ksvgcssvalues.gperf */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ksvgcssvalues.gperf; sourceTree = "<group>"; };
6565820F09D15111000E61D7 /* ksvgcssvalues.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ksvgcssvalues.h; sourceTree = "<group>"; };
6565821009D15111000E61D7 /* ksvgcssvalues.in */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ksvgcssvalues.in; sourceTree = "<group>"; };
656B84DC0AEA1D3100A095B4 /* ResourceLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceLoader.cpp; sourceTree = "<group>"; };
656B84DE0AEA1D3100A095B4 /* ResourceLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ResourceLoaderClient.h; sourceTree = "<group>"; };
656B84DF0AEA1D3100A095B4 /* ResourceLoaderInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ResourceLoaderInternal.h; sourceTree = "<group>"; };
656B84EA0AEA1DDA00A095B4 /* ResourceLoaderMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceLoaderMac.mm; sourceTree = "<group>"; };
656B85370AEA1F9A00A095B4 /* ResourceLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ResourceLoader.h; sourceTree = "<group>"; };
656B84DC0AEA1D3100A095B4 /* ResourceHandle.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceHandle.cpp; sourceTree = "<group>"; };
656B84DE0AEA1D3100A095B4 /* ResourceHandleClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ResourceHandleClient.h; sourceTree = "<group>"; };
656B84DF0AEA1D3100A095B4 /* ResourceHandleInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ResourceHandleInternal.h; sourceTree = "<group>"; };
656B84EA0AEA1DDA00A095B4 /* ResourceHandleMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceHandleMac.mm; sourceTree = "<group>"; };
656B85370AEA1F9A00A095B4 /* ResourceHandle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ResourceHandle.h; sourceTree = "<group>"; };
656D371A0ADBA5DE00A4554D /* LoaderNSURLExtras.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = LoaderNSURLExtras.h; sourceTree = "<group>"; };
656D371B0ADBA5DE00A4554D /* LoaderNSURLExtras.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = LoaderNSURLExtras.m; sourceTree = "<group>"; };
656D371C0ADBA5DE00A4554D /* WebDataProtocol.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebDataProtocol.h; sourceTree = "<group>"; };
......@@ -6345,10 +6345,10 @@
656B84E70AEA1DAE00A095B4 /* mac */,
6522BCDE09C9DAA800C9BA7A /* ResourceRequest.h */,
655A81BD0AEF67E6000975F0 /* HTTPHeaderMap.h */,
656B85370AEA1F9A00A095B4 /* ResourceLoader.h */,
656B84DC0AEA1D3100A095B4 /* ResourceLoader.cpp */,
656B84DE0AEA1D3100A095B4 /* ResourceLoaderClient.h */,
656B84DF0AEA1D3100A095B4 /* ResourceLoaderInternal.h */,
656B85370AEA1F9A00A095B4 /* ResourceHandle.h */,
656B84DC0AEA1D3100A095B4 /* ResourceHandle.cpp */,
656B84DE0AEA1D3100A095B4 /* ResourceHandleClient.h */,
656B84DF0AEA1D3100A095B4 /* ResourceHandleInternal.h */,
);
path = network;
sourceTree = "<group>";
......@@ -6356,7 +6356,7 @@
656B84E70AEA1DAE00A095B4 /* mac */ = {
isa = PBXGroup;
children = (
656B84EA0AEA1DDA00A095B4 /* ResourceLoaderMac.mm */,
656B84EA0AEA1DDA00A095B4 /* ResourceHandleMac.mm */,
);
path = mac;
sourceTree = "<group>";
......@@ -10438,9 +10438,9 @@
8542A7970AE5C94300DF58DF /* JSSVGNumber.h in Headers */,
8542A7990AE5C94400DF58DF /* JSSVGElementWrapperFactory.h in Headers */,
EDEC98030AED7E170059137F /* WebCorePrefix.h in Headers */,
656B84E20AEA1D3100A095B4 /* ResourceLoaderClient.h in Headers */,
656B84E30AEA1D3100A095B4 /* ResourceLoaderInternal.h in Headers */,
656B85380AEA1F9A00A095B4 /* ResourceLoader.h in Headers */,
656B84E20AEA1D3100A095B4 /* ResourceHandleClient.h in Headers */,
656B84E30AEA1D3100A095B4 /* ResourceHandleInternal.h in Headers */,
656B85380AEA1F9A00A095B4 /* ResourceHandle.h in Headers */,
85B916840AEBDB47008DD727 /* DOMHTMLFormElementPrivate.h in Headers */,
853CA9D70AEEC5E9002372DC /* RenderSVGContainer.h in Headers */,
853CA9D90AEEC5E9002372DC /* RenderSVGImage.h in Headers */,
......@@ -11674,8 +11674,8 @@
8542A7960AE5C94200DF58DF /* JSSVGPoint.cpp in Sources */,
8542A7980AE5C94300DF58DF /* JSSVGNumber.cpp in Sources */,
8542A79A0AE5C94400DF58DF /* JSSVGElementWrapperFactory.cpp in Sources */,
656B84E00AEA1D3100A095B4 /* ResourceLoader.cpp in Sources */,
656B84EB0AEA1DDA00A095B4 /* ResourceLoaderMac.mm in Sources */,
656B84E00AEA1D3100A095B4 /* ResourceHandle.cpp in Sources */,
656B84EB0AEA1DDA00A095B4 /* ResourceHandleMac.mm in Sources */,
853CA9D60AEEC5E9002372DC /* RenderSVGContainer.cpp in Sources */,
853CA9D80AEEC5E9002372DC /* RenderSVGImage.cpp in Sources */,
853CA9DA0AEEC5E9002372DC /* RenderSVGInline.cpp in Sources */,
......@@ -181,7 +181,7 @@
platform/TextEncodingRegistry.cpp
platform/TextStream.cpp
platform/Timer.cpp
platform/network/ResourceLoader.cpp
platform/network/ResourceHandle.cpp
platform/Widget.cpp
</set>
......@@ -204,7 +204,7 @@
platform/win/SharedTimerWin.cpp
platform/win/SystemTimeWin.cpp
platform/win/TemporaryLinkStubs.cpp
platform/network/win/ResourceLoaderWin.cpp
platform/network/win/ResourceHandleWin.cpp
platform/win/WidgetWin.cpp
</set>
......
......@@ -71,7 +71,7 @@
#import "RenderTableCell.h"
#import "RenderTheme.h"
#import "RenderView.h"
#import "ResourceLoader.h"
#import "ResourceHandle.h"
#import "TextIterator.h"
#import "WebCoreEditCommand.h"
#import "WebCoreFrameBridge.h"
......
......@@ -36,7 +36,7 @@
#include "PlatformKeyboardEvent.h"
#include "Plugin.h"
#include "RenderFrame.h"
#include "ResourceLoader.h"
#include "ResourceHandle.h"
#include <windows.h>
namespace WebCore {
......
......@@ -41,7 +41,7 @@
#include "HTMLTokenizer.h"
#include "LoaderFunctions.h"
#include "ProcessingInstruction.h"
#include "ResourceLoader.h"
#include "ResourceHandle.h"
#include <libxml/parser.h>
#include <libxml/parserInternals.h>
#include <wtf/Platform.h>
......
......@@ -35,7 +35,7 @@
#include "DocLoader.h"
#include "Document.h"
#include "Image.h"
#include "ResourceLoader.h"
#include "ResourceHandle.h"
using namespace std;
......
......@@ -30,7 +30,7 @@
#include "CachePolicy.h"
#include "PlatformString.h"
#include "ResourceLoaderClient.h" // defines PlatformResponse and PlatformData
#include "ResourceHandleClient.h" // defines PlatformResponse and PlatformData
#include <wtf/HashSet.h>
#include <wtf/Vector.h>
#include <time.h>
......
......@@ -26,7 +26,7 @@
#include <wtf/Vector.h>
#include <wtf/HashMap.h>
#include "PlatformString.h"
#include "ResourceLoaderClient.h" // Defines PlatformResponse
#include "ResourceHandleClient.h" // Defines PlatformResponse
#include "HTTPHeaderMap.h"
#ifdef __OBJC__
......
......@@ -72,7 +72,7 @@ void IconLoader::startLoading()
m_url = m_frame->iconURL();
ResourceRequest request(m_url);
m_resourceLoader = ResourceLoader::create(request, this, m_frame->document()->docLoader());
m_resourceLoader = ResourceHandle::create(request, this, m_frame->document()->docLoader());
if (!m_resourceLoader)
LOG_ERROR("Failed to start load for icon at url %s", m_frame->iconURL().url().ascii());
......@@ -86,7 +86,7 @@ void IconLoader::stopLoading()
m_data.clear();
}
void IconLoader::didReceiveData(ResourceLoader* resourceLoader, const char* data, int size)
void IconLoader::didReceiveData(ResourceHandle* resourceLoader, const char* data, int size)
{
ASSERT(resourceLoader == m_resourceLoader);
ASSERT(data);
......@@ -96,7 +96,7 @@ void IconLoader::didReceiveData(ResourceLoader* resourceLoader, const char* data
m_data.append(data[i]);
}
void IconLoader::didFinishLoading(ResourceLoader* resourceLoader)
void IconLoader::didFinishLoading(ResourceHandle* resourceLoader)
{
ASSERT(resourceLoader == m_resourceLoader);
......
......@@ -25,13 +25,13 @@
#ifndef ICONLOADER_H_
#define ICONLOADER_H_
#include "ResourceLoader.h"
#include "ResourceHandle.h"
namespace WebCore {
class Frame;
class IconLoader : public ResourceLoaderClient
class IconLoader : public ResourceHandleClient
{
public:
static IconLoader* createForFrame(Frame* frame);
......@@ -40,17 +40,17 @@ public:
void startLoading();
void stopLoading();
// ResourceLoaderClient delegate methods
virtual void receivedResponse(ResourceLoader*, PlatformResponse);
virtual void didReceiveData(ResourceLoader*, const char*, int);
virtual void didFinishLoading(ResourceLoader*);
// ResourceHandleClient delegate methods
virtual void receivedResponse(ResourceHandle*, PlatformResponse);
virtual void didReceiveData(ResourceHandle*, const char*, int);
virtual void didFinishLoading(ResourceHandle*);
private:
IconLoader(Frame* frame);
void notifyIconChanged(const KURL& iconURL);
KURL m_url;
RefPtr<ResourceLoader> m_resourceLoader;
RefPtr<ResourceHandle> m_resourceLoader;
Frame* m_frame;
static const int IconLoaderDefaultBuffer = 4096;
......
......@@ -37,7 +37,7 @@
#include "HTMLDocument.h"
#include "LoaderFunctions.h"
#include "Request.h"
#include "ResourceLoader.h"
#include "ResourceHandle.h"
#include <wtf/Assertions.h>
#include <wtf/Vector.h>
......@@ -82,13 +82,13 @@ void Loader::servePendingRequests()
domain = static_cast<HTMLDocument*>(req->docLoader()->doc())->domain().deprecatedString();
}
RefPtr<ResourceLoader> loader = ResourceLoader::create(request, this, req->docLoader());
RefPtr<ResourceHandle> loader = ResourceHandle::create(request, this, req->docLoader());
if (loader)
m_requestsLoading.add(loader.get(), req);
}
void Loader::receivedAllData(ResourceLoader* job, PlatformData allData)
void Loader::receivedAllData(ResourceHandle* job, PlatformData allData)
{
RequestMap::iterator i = m_requestsLoading.find(job);
if (i == m_requestsLoading.end())
......@@ -118,7 +118,7 @@ void Loader::receivedAllData(ResourceLoader* job, PlatformData allData)
servePendingRequests();
}
void Loader::receivedResponse(ResourceLoader* job, PlatformResponse response)
void Loader::receivedResponse(ResourceHandle* job, PlatformResponse response)
{
Request* req = m_requestsLoading.get(job);
ASSERT(req);
......@@ -145,7 +145,7 @@ void Loader::receivedResponse(ResourceLoader* job, PlatformResponse response)
}
}
void Loader::didReceiveData(ResourceLoader* job, const char* data, int size)
void Loader::didReceiveData(ResourceHandle* job, const char* data, int size)
{
Request* request = m_requestsLoading.get(job);
if (!request)
......@@ -202,7 +202,7 @@ void Loader::cancelRequests(DocLoader* dl)
++pIt;
}
Vector<ResourceLoader*, 256> jobsToCancel;
Vector<ResourceHandle*, 256> jobsToCancel;
RequestMap::iterator end = m_requestsLoading.end();
for (RequestMap::iterator i = m_requestsLoading.begin(); i != end; ++i) {
......@@ -212,7 +212,7 @@ void Loader::cancelRequests(DocLoader* dl)
}
for (unsigned i = 0; i < jobsToCancel.size(); ++i) {
ResourceLoader* job = jobsToCancel[i];
ResourceHandle* job = jobsToCancel[i];
Request* r = m_requestsLoading.get(job);
m_requestsLoading.remove(job);
cache()->remove(r->cachedObject());
......@@ -235,7 +235,7 @@ void Loader::removeBackgroundDecodingRequest(Request* r)
m_requestsBackgroundDecoding.remove(r);
}
ResourceLoader* Loader::jobForRequest(const String& URL) const
ResourceHandle* Loader::jobForRequest(const String& URL) const
{
RequestMap::const_iterator end = m_requestsLoading.end();
for (RequestMap::const_iterator i = m_requestsLoading.begin(); i != end; ++i) {
......
......@@ -27,7 +27,7 @@
#ifndef loader_h
#define loader_h
#include "ResourceLoaderClient.h"
#include "ResourceHandleClient.h"
#include <wtf/HashMap.h>
#include "DeprecatedPtrList.h"
......@@ -46,7 +46,7 @@ namespace WebCore {
class Request;
class String;
class Loader : ResourceLoaderClient
class Loader : ResourceHandleClient
{
public:
Loader();
......@@ -60,17 +60,17 @@ namespace WebCore {
void removeBackgroundDecodingRequest(Request*);
// may return 0
ResourceLoader* jobForRequest(const String& URL) const;
ResourceHandle* jobForRequest(const String& URL) const;
private:
virtual void receivedResponse(ResourceLoader*, PlatformResponse);
virtual void didReceiveData(ResourceLoader*, const char*, int);
virtual void receivedAllData(ResourceLoader*, PlatformData);
virtual void receivedResponse(ResourceHandle*, PlatformResponse);
virtual void didReceiveData(ResourceHandle*, const char*, int);
virtual void receivedAllData(ResourceHandle*, PlatformData);
void servePendingRequests();
DeprecatedPtrList<Request> m_requestsPending;
typedef HashMap<ResourceLoader*, Request*> RequestMap;
typedef HashMap<ResourceHandle*, Request*> RequestMap;
RequestMap m_requestsLoading;
DeprecatedPtrList<Request> m_requestsBackgroundDecoding;
......
......@@ -31,7 +31,7 @@
using namespace WebCore;
void IconLoader::receivedResponse(ResourceLoader* resourceLoader, NSURLResponse* responsePtr)
void IconLoader::receivedResponse(ResourceHandle* resourceLoader, NSURLResponse* responsePtr)
{
ASSERT(resourceLoader);
ASSERT(responsePtr);
......
......@@ -37,7 +37,7 @@
#import "FrameLoader.h"
#import "Logging.h"
#import "Request.h"
#import "ResourceLoader.h"
#import "ResourceHandle.h"
#import "ResourceRequest.h"
#import "WebCoreFrameBridge.h"
#import "loader.h"
......
......@@ -57,7 +57,7 @@ namespace WebCore {
class Frame;
class FrameLoader;
// FIXME: Rename to ResourceLoader after resolving conflict with existing class of that name.
// FIXME: Rename to ResourceHandle after resolving conflict with existing class of that name.
class WebResourceLoader : public Shared<WebResourceLoader> {
public:
virtual ~WebResourceLoader();
......
......@@ -42,12 +42,12 @@ namespace WebCore {
class FormData;
class String;
class ResourceLoader;
class ResourceHandle;
class ResourceRequest;
class SubresourceLoader : public WebResourceLoader {
public:
static PassRefPtr<SubresourceLoader> create(Frame*, ResourceLoader*, ResourceRequest&);
static PassRefPtr<SubresourceLoader> create(Frame*, ResourceHandle*, ResourceRequest&);
virtual ~SubresourceLoader();
......@@ -58,14 +58,14 @@ namespace WebCore {
virtual void didFail(NSError *);
private:
static PassRefPtr<SubresourceLoader> create(Frame*, ResourceLoader*,
static PassRefPtr<SubresourceLoader> create(Frame*, ResourceHandle*,
NSMutableURLRequest *, NSDictionary *customHeaders, const String& referrer);
SubresourceLoader(Frame*, ResourceLoader*);
SubresourceLoader(Frame*, ResourceHandle*);
virtual void didCancel(NSError *);
RefPtr<ResourceLoader> m_loader;
RefPtr<ResourceHandle> m_loader;
bool m_loadingMultipartContent;
};
......
......@@ -34,7 +34,7 @@
#import "LoaderFunctions.h"
#import "LoaderNSURLExtras.h"
#import "LoaderNSURLRequestExtras.h"
#import "ResourceLoader.h"
#import "ResourceHandle.h"
#import "WebCoreFrameBridge.h"
#import "WebCoreSystemInterface.h"
#import "WebFormDataStream.h"
......@@ -45,7 +45,7 @@ using namespace WebCore;
namespace WebCore {