- 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: https://svn.webkit.org/repository/webkit/trunk@17410
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
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)
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
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.
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
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>
>
</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
>
</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
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, ); }; };
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>"; };
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>";
656B84E70AEA1DAE00A095B4 /* mac */ = {
isa = PBXGroup;
children = (
- 656B84EA0AEA1DDA00A095B4 /* ResourceLoaderMac.mm */,
+ 656B84EA0AEA1DDA00A095B4 /* ResourceHandleMac.mm */,
);
path = mac;
sourceTree = "<group>";
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 */,
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 */,
platform/TextEncodingRegistry.cpp
platform/TextStream.cpp
platform/Timer.cpp
- platform/network/ResourceLoader.cpp
+ platform/network/ResourceHandle.cpp
platform/Widget.cpp
</set>
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>
#import "RenderTableCell.h"
#import "RenderTheme.h"
#import "RenderView.h"
-#import "ResourceLoader.h"
+#import "ResourceHandle.h"
#import "TextIterator.h"
#import "WebCoreEditCommand.h"
#import "WebCoreFrameBridge.h"
#include "PlatformKeyboardEvent.h"
#include "Plugin.h"
#include "RenderFrame.h"
-#include "ResourceLoader.h"
+#include "ResourceHandle.h"
#include <windows.h>
namespace WebCore {
#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>
#include "DocLoader.h"
#include "Document.h"
#include "Image.h"
-#include "ResourceLoader.h"
+#include "ResourceHandle.h"
using namespace std;
#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>
#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__
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());
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);
m_data.append(data[i]);
}
-void IconLoader::didFinishLoading(ResourceLoader* resourceLoader)
+void IconLoader::didFinishLoading(ResourceHandle* resourceLoader)
{
ASSERT(resourceLoader == m_resourceLoader);
#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);
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;
#include "HTMLDocument.h"
#include "LoaderFunctions.h"
#include "Request.h"
-#include "ResourceLoader.h"
+#include "ResourceHandle.h"
#include <wtf/Assertions.h>
#include <wtf/Vector.h>
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())
servePendingRequests();
}
-void Loader::receivedResponse(ResourceLoader* job, PlatformResponse response)
+void Loader::receivedResponse(ResourceHandle* job, PlatformResponse response)
{
Request* req = m_requestsLoading.get(job);
ASSERT(req);
}
}
-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)
++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) {
}
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());
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) {
#ifndef loader_h
#define loader_h
-#include "ResourceLoaderClient.h"
+#include "ResourceHandleClient.h"
#include <wtf/HashMap.h>
#include "DeprecatedPtrList.h"
class Request;
class String;
- class Loader : ResourceLoaderClient
+ class Loader : ResourceHandleClient
{
public:
Loader();
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;
using namespace WebCore;
-void IconLoader::receivedResponse(ResourceLoader* resourceLoader, NSURLResponse* responsePtr)
+void IconLoader::receivedResponse(ResourceHandle* resourceLoader, NSURLResponse* responsePtr)
{
ASSERT(resourceLoader);
ASSERT(responsePtr);
#import "FrameLoader.h"
#import "Logging.h"
#import "Request.h"
-#import "ResourceLoader.h"
+#import "ResourceHandle.h"
#import "ResourceRequest.h"
#import "WebCoreFrameBridge.h"
#import "loader.h"
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();
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();
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;
};
#import "LoaderFunctions.h"
#import "LoaderNSURLExtras.h"
#import "LoaderNSURLRequestExtras.h"
-#import "ResourceLoader.h"
+#import "ResourceHandle.h"
#import "WebCoreFrameBridge.h"
#import "WebCoreSystemInterface.h"
#import "WebFormDataStream.h"
namespace WebCore {
-SubresourceLoader::SubresourceLoader(Frame* frame, ResourceLoader* loader)
+SubresourceLoader::SubresourceLoader(Frame* frame, ResourceHandle* loader)
: WebResourceLoader(frame)
, m_loader(loader)
, m_loadingMultipartContent(false)
{
}
-PassRefPtr<SubresourceLoader> SubresourceLoader::create(Frame* frame, ResourceLoader* loader, ResourceRequest& request)
+PassRefPtr<SubresourceLoader> SubresourceLoader::create(Frame* frame, ResourceHandle* loader, ResourceRequest& request)
{
FrameLoader* fl = frame->loader();
if (fl->state() == FrameStateProvisional)
#include "FramePrivate.h"
#include "GraphicsContext.h"
#include "HTMLDocument.h"
-#include "ResourceLoader.h"
-#include "ResourceLoaderInternal.h"
+#include "ResourceHandle.h"
+#include "ResourceHandleInternal.h"
#include "PlatformMouseEvent.h"
#include "PlatformKeyboardEvent.h"
#include "PlatformWheelEvent.h"
namespace WebCore {
FrameGdkClientDefault::FrameGdkClientDefault()
- : ResourceLoaderClient()
+ : ResourceHandleClient()
, m_frame(0)
, m_beginCalled(false)
{
m_beginCalled = false;
ResourceRequest request(url);
- RefPtr<ResourceLoader> loader = ResourceLoader::create(request, this, 0);
+ RefPtr<ResourceHandle> loader = ResourceHandle::create(request, this, 0);
}
void FrameGdkClientDefault::submitForm(const String& method, const KURL& url, const FormData* postData)
request.setHTTPMethod(method);
request.setHTTPBody(*postData);
- RefPtr<ResourceLoader> loader = ResourceLoader::create(request, this, 0);
+ RefPtr<ResourceHandle> loader = ResourceHandle::create(request, this, 0);
}
-void FrameGdkClientDefault::receivedResponse(ResourceLoader*, PlatformResponse)
+void FrameGdkClientDefault::receivedResponse(ResourceHandle*, PlatformResponse)
{
// no-op
}
-void FrameGdkClientDefault::didReceiveData(ResourceLoader* job, const char* data, int length)
+void FrameGdkClientDefault::didReceiveData(ResourceHandle* job, const char* data, int length)
{
if (!m_beginCalled) {
m_beginCalled = true;
#if 0 // FIXME: This is from Qt version, need to be removed or Gdk equivalent written
// Assign correct mimetype _before_ calling begin()!
- ResourceLoaderInternal* d = job->getInternal();
+ ResourceHandleInternal* d = job->getInternal();
if (d) {
ResourceRequest request(m_frame->resourceRequest());
request.m_responseMIMEType = d->m_mimetype;
m_frame->write(data, length);
}
-void FrameGdkClientDefault::receivedAllData(ResourceLoader* job, PlatformData data)
+void FrameGdkClientDefault::receivedAllData(ResourceHandle* job, PlatformData data)
{
m_frame->end();
m_beginCalled = false;
#define FrameGdk_H_
#include "Frame.h"
-#include "ResourceLoaderClient.h"
+#include "ResourceHandleClient.h"
#include <gdk/gdk.h>
namespace WebCore {
};
class FrameGdkClientDefault : public FrameGdkClient,
- public ResourceLoaderClient
+ public ResourceHandleClient
{
public:
virtual void openURL(const KURL&);
virtual void submitForm(const String& method, const KURL&, const FormData*);
- // ResourceLoaderClient
- virtual void receivedResponse(ResourceLoader*, PlatformResponse);
- virtual void didReceiveData(ResourceLoader*, const char*, int);
- virtual void receivedAllData(ResourceLoader*, PlatformData);
+ // ResourceHandleClient
+ virtual void receivedResponse(ResourceHandle*, PlatformResponse);
+ virtual void didReceiveData(ResourceHandle*, const char*, int);
+ virtual void receivedAllData(ResourceHandle*, PlatformData);
private:
FrameGdk* m_frame;
namespace WebCore {
-Vector<char> ServeSynchronousRequest(Loader*,DocLoader*,ResourceLoader*,KURL&,DeprecatedString&) { notImplemented(); return Vector<char>(); }
+Vector<char> ServeSynchronousRequest(Loader*,DocLoader*,ResourceHandle*,KURL&,DeprecatedString&) { notImplemented(); return Vector<char>(); }
}
bool WebCore::PlugInInfoStore::supportsMIMEType(const WebCore::String&) { return false; }
void WebCore::refreshPlugins(bool) { }
-void WebCore::ResourceLoader::assembleResponseHeaders() const { }
-void WebCore::ResourceLoader::retrieveCharset() const { }
+void WebCore::ResourceHandle::assembleResponseHeaders() const { }
+void WebCore::ResourceHandle::retrieveCharset() const { }
void FrameGdk::restoreDocumentState() { }
void FrameGdk::partClearedInBegin() { }
*/
#include "config.h"
-#include "ResourceLoader.h"
-#include "ResourceLoaderInternal.h"
+#include "ResourceHandle.h"
+#include "ResourceHandleInternal.h"
#include "LoaderFunctions.h"
#include "Logging.h"
namespace WebCore {
-ResourceLoader::ResourceLoader(const ResourceRequest& request, ResourceLoaderClient* client)
- : d(new ResourceLoaderInternal(this, request, client))
+ResourceHandle::ResourceHandle(const ResourceRequest& request, ResourceHandleClient* client)
+ : d(new ResourceHandleInternal(this, request, client))
{
}
-PassRefPtr<ResourceLoader> ResourceLoader::create(const ResourceRequest& request, ResourceLoaderClient* client, DocLoader* dl)
+PassRefPtr<ResourceHandle> ResourceHandle::create(const ResourceRequest& request, ResourceHandleClient* client, DocLoader* dl)
{
- RefPtr<ResourceLoader> newLoader(new ResourceLoader(request, client));
+ RefPtr<ResourceHandle> newLoader(new ResourceHandle(request, client));
if (newLoader->start(dl))
return newLoader.release();
return 0;
}
-bool ResourceLoader::isErrorPage() const
+bool ResourceHandle::isErrorPage() const
{
return d->status != 0;
}
-int ResourceLoader::error() const
+int ResourceHandle::error() const
{
return d->status;
}
-void ResourceLoader::setError(int e)
+void ResourceHandle::setError(int e)
{
d->status = e;
}
-String ResourceLoader::responseEncoding() const
+String ResourceHandle::responseEncoding() const
{
retrieveResponseEncoding();
return d->m_responseEncoding;
}
-String ResourceLoader::responseHTTPHeadersAsString() const
+String ResourceHandle::responseHTTPHeadersAsString() const
{
assembleResponseHeaders();
return d->responseHeaders;
}
-void ResourceLoader::kill()
+void ResourceHandle::kill()
{
if (d->m_loading){
ASSERT(!d->m_cancelled);
}
}
-const HTTPHeaderMap& ResourceLoader::requestHeaders() const
+const HTTPHeaderMap& ResourceHandle::requestHeaders() const
{
return d->m_request.httpHeaderFields();
}
-const KURL& ResourceLoader::url() const
+const KURL& ResourceHandle::url() const
{
return d->m_request.url();
}
-const FormData& ResourceLoader::postData() const
+const FormData& ResourceHandle::postData() const
{
return d->m_request.httpBody();
}
-const String& ResourceLoader::method() const
+const String& ResourceHandle::method() const
{
return d->m_request.httpMethod();
}
-ResourceLoaderClient* ResourceLoader::client() const
+ResourceHandleClient* ResourceHandle::client() const
{
return d->m_client;
}
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef ResourceLoader_h
-#define ResourceLoader_h
+#ifndef ResourceHandle_h
+#define ResourceHandle_h
-#include "ResourceLoaderClient.h" // for PlatformResponse
+#include "ResourceHandleClient.h" // for PlatformResponse
#include "ResourceRequest.h"
#include "StringHash.h"
#include "Timer.h"
class DocLoader;
class FormData;
class KURL;
-class ResourceLoaderInternal;
+class ResourceHandleInternal;
-class ResourceLoader : public Shared<ResourceLoader> {
+class ResourceHandle : public Shared<ResourceHandle> {
private:
- ResourceLoader(const ResourceRequest&, ResourceLoaderClient*);
+ ResourceHandle(const ResourceRequest&, ResourceHandleClient*);
public:
// FIXME: should not need the DocLoader
- static PassRefPtr<ResourceLoader> create(const ResourceRequest&, ResourceLoaderClient*, DocLoader*);
+ static PassRefPtr<ResourceHandle> create(const ResourceRequest&, ResourceHandleClient*, DocLoader*);
- ~ResourceLoader();
+ ~ResourceHandle();
int error() const;
void setError(int);
#if USE(WININET)
void setHasReceivedResponse(bool b = true);
bool hasReceivedResponse() const;
- void fileLoadTimer(Timer<ResourceLoader>* timer);
+ void fileLoadTimer(Timer<ResourceHandle>* timer);
void onHandleCreated(LPARAM);
void onRequestRedirected(LPARAM);
void onRequestComplete(LPARAM);
friend void __stdcall transferJobStatusCallback(HINTERNET, DWORD_PTR, DWORD, LPVOID, DWORD);
- friend LRESULT __stdcall ResourceLoaderWndProc(HWND, unsigned message, WPARAM, LPARAM);
+ friend LRESULT __stdcall ResourceHandleWndProc(HWND, unsigned message, WPARAM, LPARAM);
#endif
#if PLATFORM(GDK) || PLATFORM(QT)
- ResourceLoaderInternal* getInternal() { return d; }
+ ResourceHandleInternal* getInternal() { return d; }
#endif
#if PLATFORM(QT)
void cancel();
- ResourceLoaderClient* client() const;
+ ResourceHandleClient* client() const;
void receivedResponse(PlatformResponse);
void assembleResponseHeaders() const;
void retrieveResponseEncoding() const;
- ResourceLoaderInternal* d;
+ ResourceHandleInternal* d;
};
}
-#endif // ResourceLoader_h
+#endif // ResourceHandle_h
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef ResourceLoaderClient_h
-#define ResourceLoaderClient_h
+#ifndef ResourceHandleClient_h
+#define ResourceHandleClient_h
#include <wtf/Platform.h>
#if USE(CFNETWORK)
#endif
class KURL;
- class ResourceLoader;
+ class ResourceHandle;
- class ResourceLoaderClient {
+ class ResourceHandleClient {
public:
- virtual ~ResourceLoaderClient() { }
+ virtual ~ResourceHandleClient() { }
// request may be modified
- // void willSendRequest(ResourceLoader*, Request&, const ResourceResonse& redirectResponse) { }
+ // void willSendRequest(ResourceHandle*, Request&, const ResourceResonse& redirectResponse) { }
- // void didReceiveAuthenticationChallenge(ResourceLoader*, const AuthenticationChallenge&) { }
- // void didCancelAuthenticationChallenge(ResourceLoader*, const AuthenticationChallenge&) { }
+ // void didReceiveAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge&) { }
+ // void didCancelAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge&) { }
- // void didReceiveResponse(ResourceLoader*, const ResourceResponse&) { }
- virtual void didReceiveData(ResourceLoader*, const char*, int) { }
- virtual void didFinishLoading(ResourceLoader*) { }
+ // void didReceiveResponse(ResourceHandle*, const ResourceResponse&) { }
+ virtual void didReceiveData(ResourceHandle*, const char*, int) { }
+ virtual void didFinishLoading(ResourceHandle*) { }
// void didFailWithError(ResourceError*) { }
// cached response may be modified
- // void willCacheResponse(ResourceLoader*, CachedResourceResponse&) { }
+ // void willCacheResponse(ResourceHandle*, CachedResourceResponse&) { }
// old-style methods
- virtual void receivedRedirect(ResourceLoader*, const KURL&) { }
- virtual void receivedResponse(ResourceLoader*, PlatformResponse) { }
- virtual void receivedAllData(ResourceLoader*, PlatformData) { }
+ virtual void receivedRedirect(ResourceHandle*, const KURL&) { }
+ virtual void receivedResponse(ResourceHandle*, PlatformResponse) { }
+ virtual void receivedAllData(ResourceHandle*, PlatformData) { }
};
}
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef ResourceLoaderInternal_h
-#define ResourceLoaderInternal_h
+#ifndef ResourceHandleInternal_h
+#define ResourceHandleInternal_h
#include "FormData.h"
#include "KURL.h"
#include "WebSubresourceLoader.h"
#endif
-// The allocations and releases in ResourceLoaderInternal are
+// The allocations and releases in ResourceHandleInternal are
// Cocoa-exception-free (either simple Foundation classes or
// WebCoreResourceLoaderImp which avoids doing work in dealloc).
namespace WebCore {
- class ResourceLoaderInternal
+ class ResourceHandleInternal
{
public:
- ResourceLoaderInternal(ResourceLoader* loader, const ResourceRequest& request, ResourceLoaderClient* c)
+ ResourceHandleInternal(ResourceHandle* loader, const ResourceRequest& request, ResourceHandleClient* c)
: m_client(c)
, m_request(request)
, status(0)
#endif
#if USE(WININET)
, m_fileHandle(INVALID_HANDLE_VALUE)
- , m_fileLoadTimer(loader, &ResourceLoader::fileLoadTimer)
+ , m_fileLoadTimer(loader, &ResourceHandle::fileLoadTimer)
, m_resourceHandle(0)
, m_secondaryHandle(0)
, m_jobId(0)
{
}
- ~ResourceLoaderInternal();
+ ~ResourceHandleInternal();
- ResourceLoaderClient* m_client;
+ ResourceHandleClient* m_client;
ResourceRequest m_request;
#endif
#if USE(WININET)
HANDLE m_fileHandle;
- Timer<ResourceLoader> m_fileLoadTimer;
+ Timer<ResourceHandle> m_fileLoadTimer;
HINTERNET m_resourceHandle;
HINTERNET m_secondaryHandle;
unsigned m_jobId;
} // namespace WebCore
-#endif // ResourceLoaderInternal_h
+#endif // ResourceHandleInternal_h
#if USE(CFNETWORK)
-#include "ResourceLoader.h"
-#include "ResourceLoaderInternal.h"
+#include "ResourceHandle.h"
+#include "ResourceHandleInternal.h"
#include "DocLoader.h"
#include "Frame.h"
CFURLRequestRef willSendRequest(CFURLConnectionRef conn, CFURLRequestRef request, CFURLResponseRef redirectionResponse, const void* clientInfo)
{
- ResourceLoader* job = (ResourceLoader*)clientInfo;
+ ResourceHandle* job = (ResourceHandle*)clientInfo;
CFURLRef url = CFURLRequestGetURL(request);
CFStringRef urlString = CFURLGetString(url);
const char *bytes = CFStringGetCStringPtr(urlString, kCFStringEncodingUTF8);
void didReceiveResponse(CFURLConnectionRef conn, CFURLResponseRef response, const void* clientInfo)
{
- ResourceLoader* job = (ResourceLoader*)clientInfo;
+ ResourceHandle* job = (ResourceHandle*)clientInfo;
#if defined(LOG_RESOURCELOADER_EVENTS)
CFStringRef str = CFStringCreateWithFormat(0, 0, CFSTR("didReceiveResponse(conn=%p, job = %p)\n"), conn, job);
void didReceiveData(CFURLConnectionRef conn, CFDataRef data, CFIndex originalLength, const void* clientInfo)
{
- ResourceLoader* job = (ResourceLoader*)clientInfo;
+ ResourceHandle* job = (ResourceHandle*)clientInfo;
const UInt8* bytes = CFDataGetBytePtr(data);
CFIndex length = CFDataGetLength(data);
void didFinishLoading(CFURLConnectionRef conn, const void* clientInfo)
{
- ResourceLoader* job = (ResourceLoader*)clientInfo;
+ ResourceHandle* job = (ResourceHandle*)clientInfo;
#if defined(LOG_RESOURCELOADER_EVENTS)
CFStringRef str = CFStringCreateWithFormat(0, 0, CFSTR("didFinishLoading(conn=%p, job = %p)\n"), conn, job);
void didFail(CFURLConnectionRef conn, CFStreamError error, const void* clientInfo)
{
- ResourceLoader* job = (ResourceLoader*)clientInfo;
+ ResourceHandle* job = (ResourceHandle*)clientInfo;
#if defined(LOG_RESOURCELOADER_EVENTS)
CFStringRef str = CFStringCreateWithFormat(0, 0, CFSTR("didFail(conn=%p, job = %p, error = {%d, %d})\n"), conn, job, error.domain, error.error);
CFCachedURLResponseRef willCacheResponse(CFURLConnectionRef conn, CFCachedURLResponseRef cachedResponse, const void* clientInfo)
{
- ResourceLoader* job = (ResourceLoader*)clientInfo;
+ ResourceHandle* job = (ResourceHandle*)clientInfo;
return cachedResponse;
}
void didReceiveChallenge(CFURLConnectionRef conn, CFURLAuthChallengeRef challenge, const void* clientInfo)
{
- ResourceLoader* job = (ResourceLoader*)clientInfo;
+ ResourceHandle* job = (ResourceHandle*)clientInfo;
// Do nothing right now
}
CFRelease(allHeaders);
}
-ResourceLoaderInternal::~ResourceLoaderInternal()
+ResourceHandleInternal::~ResourceHandleInternal()
{
if (m_connection) {
}
}
-ResourceLoader::~ResourceLoader()
+ResourceHandle::~ResourceHandle()
{
#if defined(LOG_RESOURCELOADER_EVENTS)
CFStringRef str = CFStringCreateWithFormat(0, 0, CFSTR("Destroying job %p\n"), this);
CFRunLoopRun();
}
-bool ResourceLoader::start(DocLoader* docLoader)
+bool ResourceHandle::start(DocLoader* docLoader)
{
CFURLRef url = d->m_request.url().createCFURL();
CFStringRef requestMethod = d->m_request.httpMethod().createCFString();
return true;
}
-void ResourceLoader::cancel()
+void ResourceHandle::cancel()
{
if (d->m_connection) {
CFURLConnectionCancel(d->m_connection);
d->m_connection = 0;
}
- // Copied directly from ResourceLoaderWin.cpp
+ // Copied directly from ResourceHandleWin.cpp
setError(1);
d->m_client->receivedAllData(this, 0);
d->m_client->didFinishLoading(this);
*/
#include "config.h"
-#include "ResourceLoader.h"
+#include "ResourceHandle.h"
#include "DocLoader.h"
-#include "ResourceLoaderInternal.h"
-#include "ResourceLoaderManager.h"
+#include "ResourceHandleInternal.h"
+#include "ResourceHandleManager.h"
namespace WebCore {
-ResourceLoaderInternal::~ResourceLoaderInternal()
+ResourceHandleInternal::~ResourceHandleInternal()
{
}
-ResourceLoader::~ResourceLoader()
+ResourceHandle::~ResourceHandle()
{
cancel();
}
-bool ResourceLoader::start(DocLoader* docLoader)
+bool ResourceHandle::start(DocLoader* docLoader)
{
ref();
- ResourceLoaderManager::get()->add(this);
+ ResourceHandleManager::get()->add(this);
return true;
}
-void ResourceLoader::cancel()
+void ResourceHandle::cancel()
{
- ResourceLoaderManager::get()->cancel(this);
+ ResourceHandleManager::get()->cancel(this);
}
} // namespace WebCore
*/
#include "config.h"
-#include "ResourceLoaderManager.h"
+#include "ResourceHandleManager.h"
-#include "ResourceLoader.h"
-#include "ResourceLoaderInternal.h"
+#include "ResourceHandle.h"
+#include "ResourceHandleInternal.h"
namespace WebCore {
const int selectTimeoutMS = 5;
const double pollTimeSeconds = 0.05;
-ResourceLoaderManager::ResourceLoaderManager()
+ResourceHandleManager::ResourceHandleManager()
: m_useSimple(false)
- , jobs(new HashSet<ResourceLoader*>)
- , m_downloadTimer(this, &ResourceLoaderManager::downloadTimerCallback)
+ , jobs(new HashSet<ResourceHandle*>)
+ , m_downloadTimer(this, &ResourceHandleManager::downloadTimerCallback)
{
curl_global_init(CURL_GLOBAL_ALL);
curlMultiHandle = curl_multi_init();
}
-ResourceLoaderManager* ResourceLoaderManager::get()
+ResourceHandleManager* ResourceHandleManager::get()
{
- static ResourceLoaderManager* singleton;
+ static ResourceHandleManager* singleton;
if (!singleton)
- singleton = new ResourceLoaderManager;
+ singleton = new ResourceHandleManager;
return singleton;
}
-void ResourceLoaderManager::useSimpleTransfer(bool useSimple)
+void ResourceHandleManager::useSimpleTransfer(bool useSimple)
{
m_useSimple = useSimple;
}
static size_t writeCallback(void* ptr, size_t size, size_t nmemb, void* obj)
{
- ResourceLoader* job = static_cast<ResourceLoader*>(obj);
- ResourceLoaderInternal* d = job->getInternal();
+ ResourceHandle* job = static_cast<ResourceHandle*>(obj);
+ ResourceHandleInternal* d = job->getInternal();
int totalSize = size * nmemb;
d->client->didReceiveData(job, static_cast<char*>(ptr), totalSize);
return totalSize;
return totalSize;
}
-void ResourceLoaderManager::downloadTimerCallback(Timer<ResourceLoaderManager>* timer)
+void ResourceHandleManager::downloadTimerCallback(Timer<ResourceHandleManager>* timer)
{
if (jobs->isEmpty()) {
m_downloadTimer.stop();
return;
}
if (m_useSimple) {
- for (HashSet<ResourceLoader*>::iterator it = jobs->begin(); it != jobs->end(); ++it) {
- ResourceLoader* job = *it;
- ResourceLoaderInternal* d = job->getInternal();
+ for (HashSet<ResourceHandle*>::iterator it = jobs->begin(); it != jobs->end(); ++it) {
+ ResourceHandle* job = *it;
+ ResourceHandleInternal* d = job->getInternal();
CURLcode res = curl_easy_perform(d->m_handle);
if (res != CURLE_OK)
printf("Error WITH JOB %d\n", res);
// find the node which has same d->m_handle as completed transfer
CURL* chandle = msg->easy_handle;
assert(chandle);
- ResourceLoader *job;
+ ResourceHandle *job;
curl_easy_getinfo(chandle, CURLINFO_PRIVATE, &job);
assert(job); //fixme: assert->if ?
// if found, delete it
if (job) {
- ResourceLoaderInternal *d = job->getInternal();
+ ResourceHandleInternal *d = job->getInternal();
switch (msg->data.result) {
case CURLE_OK: {
// use this to authenticate
m_downloadTimer.startOneShot(pollTimeSeconds);
}
-void ResourceLoaderManager::remove(ResourceLoader* job)
+void ResourceHandleManager::remove(ResourceHandle* job)
{
- ResourceLoaderInternal* d = job->getInternal();
+ ResourceHandleInternal* d = job->getInternal();
if (!d->m_handle)
return;
if (jobs->contains(job))
}
}
-void ResourceLoaderManager::add(ResourceLoader* job)
+void ResourceHandleManager::add(ResourceHandle* job)
{
bool startTimer = jobs->isEmpty();
- ResourceLoaderInternal* d = job->getInternal();
+ ResourceHandleInternal* d = job->getInternal();
DeprecatedString url = d->URL.url();
d->m_handle = curl_easy_init();
curl_easy_setopt(d->m_handle, CURLOPT_PRIVATE, job);
m_downloadTimer.startOneShot(pollTimeSeconds);
}
-void ResourceLoaderManager::cancel(ResourceLoader* job)
+void ResourceHandleManager::cancel(ResourceHandle* job)
{
remove(job);
job->setError(1);
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef ResourceLoaderManager_H_
-#define ResourceLoaderManager_H_
+#ifndef ResourceHandleManager_H_
+#define ResourceHandleManager_H_
#include "Frame.h"
#include "Timer.h"
-#include "ResourceLoaderClient.h"
+#include "ResourceHandleClient.h"
#include <curl/curl.h>
namespace WebCore {
-class ResourceLoaderManager {
+class ResourceHandleManager {
public:
- static ResourceLoaderManager* get();
- void add(ResourceLoader*);
- void cancel(ResourceLoader*);
+ static ResourceHandleManager* get();
+ void add(ResourceHandle*);
+ void cancel(ResourceHandle*);
// If true, don't multiplex downloads: download completely one at a time.
void useSimpleTransfer(bool useSimple);
private:
- ResourceLoaderManager();
- void downloadTimerCallback(Timer<ResourceLoaderManager>*);
- void remove(ResourceLoader*);
+ ResourceHandleManager();
+ void downloadTimerCallback(Timer<ResourceHandleManager>*);
+ void remove(ResourceHandle*);
bool m_useSimple;
- HashSet<ResourceLoader*>* jobs;
- Timer<ResourceLoaderManager> m_downloadTimer;
+ HashSet<ResourceHandle*>* jobs;
+ Timer<ResourceHandleManager> m_downloadTimer;
CURLM* curlMultiHandle; // not freed
// curl filehandles to poll with select
*/
#import "config.h"
-#import "ResourceLoader.h"
-#import "ResourceLoaderInternal.h"
+#import "ResourceHandle.h"
+#import "ResourceHandleInternal.h"
#import "BlockExceptions.h"
#import "DocLoader.h"
#import "FrameLoader.h"
#import "FrameMac.h"
#import "KURL.h"
+#import "FormDataMac.h"
#import "LoaderFunctions.h"
#import "Logging.h"
#import "WebCoreFrameBridge.h"
namespace WebCore {
-ResourceLoaderInternal::~ResourceLoaderInternal()
+ResourceHandleInternal::~ResourceHandleInternal()
{
HardRelease(response);
HardRelease(loader);
}
-ResourceLoader::~ResourceLoader()
+ResourceHandle::~ResourceHandle()
{
if (d->m_subresourceLoader)
d->m_subresourceLoader->cancel();
delete d;
}
-bool ResourceLoader::start(DocLoader* docLoader)
+bool ResourceHandle::start(DocLoader* docLoader)
{
ref();
d->m_loading = true;
return false;
}
-void ResourceLoader::assembleResponseHeaders() const
+void ResourceHandle::assembleResponseHeaders() const
{
if (!d->assembledResponseHeaders) {
if ([d->response isKindOfClass:[NSHTTPURLResponse class]]) {
}
}
-void ResourceLoader::retrieveResponseEncoding() const
+void ResourceHandle::retrieveResponseEncoding() const
{
if (!d->m_retrievedResponseEncoding) {
NSString *textEncodingName = [d->response textEncodingName];
}
}
-void ResourceLoader::receivedResponse(NSURLResponse* response)
+void ResourceHandle::receivedResponse(NSURLResponse* response)
{
ASSERT(response);
client()->receivedResponse(this, response);
}
-void ResourceLoader::cancel()
+void ResourceHandle::cancel()
{
d->m_subresourceLoader->cancel();
}
-void ResourceLoader::redirectedToURL(NSURL *url)
+void ResourceHandle::redirectedToURL(NSURL *url)
{
ASSERT(url);
- if (ResourceLoaderClient* c = client())
+ if (ResourceHandleClient* c = client())
c->receivedRedirect(this, KURL(url));
}
-void ResourceLoader::addData(NSData *data)
+void ResourceHandle::addData(NSData *data)
{
ASSERT(data);
- if (ResourceLoaderClient* c = client())
+ if (ResourceHandleClient* c = client())
c->didReceiveData(this, (const char *)[data bytes], [data length]);
}
-void ResourceLoader::finishJobAndHandle(NSData *data)
+void ResourceHandle::finishJobAndHandle(NSData *data)
{
- if (ResourceLoaderClient* c = client()) {
+ if (ResourceHandleClient* c = client()) {
c->receivedAllData(this, data);
c->didFinishLoading(this);
}
kill();
}
-void ResourceLoader::reportError()
+void ResourceHandle::reportError()
{
setError(1);
finishJobAndHandle(nil);
#include <kio/job.h>
#include "FrameQt.h"
-#include "ResourceLoaderManager.h"
-#include "ResourceLoaderInternal.h"
+#include "ResourceHandleManager.h"
+#include "ResourceHandleInternal.h"
namespace WebCore {
-static ResourceLoaderManager* s_self = 0;
+static ResourceHandleManager* s_self = 0;
-ResourceLoaderManager::ResourceLoaderManager()
+ResourceHandleManager::ResourceHandleManager()
: m_jobToKioMap()
, m_kioToJobMap()
, m_frameClient(0)
{
}
-ResourceLoaderManager::~ResourceLoaderManager()
+ResourceHandleManager::~ResourceHandleManager()
{
}
-ResourceLoaderManager* ResourceLoaderManager::self()
+ResourceHandleManager* ResourceHandleManager::self()
{
if (!s_self)
- s_self = new ResourceLoaderManager();
+ s_self = new ResourceHandleManager();
return s_self;
}
-void ResourceLoaderManager::slotData(KIO::Job* kioJob, const QByteArray& data)
+void ResourceHandleManager::slotData(KIO::Job* kioJob, const QByteArray& data)
{
- ResourceLoader* job = 0;
+ ResourceHandle* job = 0;
// Check if we know about 'kioJob'...
- QMap<KIO::Job*, ResourceLoader*>::const_iterator it = m_kioToJobMap.find(kioJob);
+ QMap<KIO::Job*, ResourceHandle*>::const_iterator it = m_kioToJobMap.find(kioJob);
if (it != m_kioToJobMap.end())
job = it.value();
if (!job)
return;
- ResourceLoaderInternal* d = job->getInternal();
+ ResourceHandleInternal* d = job->getInternal();
if (!d || !d->m_client)
return;
d->m_client->didReceiveData(job, data.data(), data.size());
}
-void ResourceLoaderManager::slotMimetype(KIO::Job* kioJob, const QString& type)
+void ResourceHandleManager::slotMimetype(KIO::Job* kioJob, const QString& type)
{
- ResourceLoader* job = 0;
+ ResourceHandle* job = 0;
// Check if we know about 'kioJob'...
- QMap<KIO::Job*, ResourceLoader*>::const_iterator it = m_kioToJobMap.find(kioJob);
+ QMap<KIO::Job*, ResourceHandle*>::const_iterator it = m_kioToJobMap.find(kioJob);
if (it != m_kioToJobMap.end())
job = it.value();
if (!job)
return;
- ResourceLoaderInternal* d = job->getInternal();
+ ResourceHandleInternal* d = job->getInternal();
if (!d || !d->m_client)
return;
d->m_mimetype = type;
}
-void ResourceLoaderManager::slotResult(KJob* kjob)
+void ResourceHandleManager::slotResult(KJob* kjob)
{
KIO::Job* kioJob = qobject_cast<KIO::Job*>(kjob);
if (!kioJob)
return;
- ResourceLoader* job = 0;
+ ResourceHandle* job = 0;
// Check if we know about 'kioJob'...
- QMap<KIO::Job*, ResourceLoader*>::const_iterator it = m_kioToJobMap.find(kioJob);
+ QMap<KIO::Job*, ResourceHandle*>::const_iterator it = m_kioToJobMap.find(kioJob);
if (it != m_kioToJobMap.end())
job = it.value();
m_frameClient->checkLoaded();
}
-void ResourceLoaderManager::remove(ResourceLoader* job)
+void ResourceHandleManager::remove(ResourceHandle* job)
{
- ResourceLoaderInternal* d = job->getInternal();
+ ResourceHandleInternal* d = job->getInternal();
if (!d || !d->m_client)
return;
KIO::Job* kioJob = 0;
// Check if we know about 'job'...
- QMap<ResourceLoader*, KIO::Job*>::const_iterator it = m_jobToKioMap.find(job);
+ QMap<ResourceHandle*, KIO::Job*>::const_iterator it = m_jobToKioMap.find(job);
if (it != m_jobToKioMap.end())
kioJob = it.value();
m_kioToJobMap.remove(kioJob);
}
-void ResourceLoaderManager::add(ResourceLoader* job, FrameQtClient* frameClient)
+void ResourceHandleManager::add(ResourceHandle* job, FrameQtClient* frameClient)
{
- ResourceLoaderInternal* d = job->getInternal();
+ ResourceHandleInternal* d = job->getInternal();
DeprecatedString url = d->m_request.url().url();
KIO::Job* kioJob = 0;
ASSERT(m_frameClient == frameClient);
}
-void ResourceLoaderManager::cancel(ResourceLoader* job)
+void ResourceHandleManager::cancel(ResourceHandle* job)
{
remove(job);
job->setError(1);
} // namespace WebCore
-#include "ResourceLoaderManager.moc"
+#include "ResourceHandleManager.moc"
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef ResourceLoaderManager_H
-#define ResourceLoaderManager_H
+#ifndef ResourceHandleManager_H
+#define ResourceHandleManager_H
#include <QMap>
#include <QObject>
-#include "ResourceLoader.h"
+#include "ResourceHandle.h"
namespace WebCore {
class FrameQtClient;
-class ResourceLoaderManager : public QObject {
+class ResourceHandleManager : public QObject {
Q_OBJECT
public:
- static ResourceLoaderManager* self();
+ static ResourceHandleManager* self();
- void add(ResourceLoader*, FrameQtClient*);
- void cancel(ResourceLoader*);
+ void add(ResourceHandle*, FrameQtClient*);
+ void cancel(ResourceHandle*);
public Q_SLOTS:
void slotData(KIO::Job*, const QByteArray& data);
void slotResult(KJob*);
private:
- ResourceLoaderManager();
- ~ResourceLoaderManager();
+ ResourceHandleManager();
+ ~ResourceHandleManager();
- void remove(ResourceLoader*);
+ void remove(ResourceHandle*);
// KIO Job <-> WebKit Job mapping
- QMap<ResourceLoader*, KIO::Job*> m_jobToKioMap;
- QMap<KIO::Job*, ResourceLoader*> m_kioToJobMap;
+ QMap<ResourceHandle*, KIO::Job*> m_jobToKioMap;
+ QMap<KIO::Job*, ResourceHandle*> m_kioToJobMap;
FrameQtClient* m_frameClient;
};
#include "FrameQt.h"
#include "DocLoader.h"
-#include "ResourceLoader.h"
+#include "ResourceHandle.h"
#include "DeprecatedString.h"
-#include "ResourceLoaderManager.h"
-#include "ResourceLoaderInternal.h"
+#include "ResourceHandleManager.h"
+#include "ResourceHandleInternal.h"
namespace WebCore {
-ResourceLoaderInternal::~ResourceLoaderInternal()
+ResourceHandleInternal::~ResourceHandleInternal()
{
}
-ResourceLoader::~ResourceLoader()
+ResourceHandle::~ResourceHandle()
{
cancel();
delete d;
}
-bool ResourceLoader::start(DocLoader* docLoader)
+bool ResourceHandle::start(DocLoader* docLoader)
{
ref();
d->m_loading = true;
ASSERT(frame);
}
- ResourceLoaderManager::self()->add(this, frame ? frame->client() : 0);
+ ResourceHandleManager::self()->add(this, frame ? frame->client() : 0);
return true;
}
-void ResourceLoader::cancel()
+void ResourceHandle::cancel()
{
- ResourceLoaderManager::self()->cancel(this);
+ ResourceHandleManager::self()->cancel(this);
}
-void ResourceLoader::assembleResponseHeaders() const
+void ResourceHandle::assembleResponseHeaders() const
{
if (!d->assembledResponseHeaders) {
ASSERT(d->m_response);
}
}
-void ResourceLoader::retrieveResponseEncoding() const
+void ResourceHandle::retrieveResponseEncoding() const
{
if (!d->m_retrievedResponseEncoding) {
d->m_responseEncoding = extractCharsetFromHeaders(d->responseHeaders);
}
}
-void ResourceLoader::receivedResponse(PlatformResponse response)
+void ResourceHandle::receivedResponse(PlatformResponse response)
{
Q_ASSERT(method() == "POST");
d->m_response = response;
if (d->m_client)
- d->m_client->receivedResponse(const_cast<ResourceLoader*>(this), response);
+ d->m_client->receivedResponse(const_cast<ResourceHandle*>(this), response);
}
-QString ResourceLoader::extractCharsetFromHeaders(QString headers) const
+QString ResourceHandle::extractCharsetFromHeaders(QString headers) const
{
int pos = headers.find("content-type:", 0, false);
*/
#include "config.h"
-#include "ResourceLoader.h"
-#include "ResourceLoaderInternal.h"
-#include "ResourceLoaderWin.h"
+#include "ResourceHandle.h"
+#include "ResourceHandleInternal.h"
+#include "ResourceHandleWin.h"
#include "CString.h"
#include "DocLoader.h"
namespace WebCore {
static unsigned transferJobId = 0;
-static HashMap<int, ResourceLoader*>* jobIdMap = 0;
+static HashMap<int, ResourceHandle*>* jobIdMap = 0;
static HWND transferJobWindowHandle = 0;
-const LPCWSTR kResourceLoaderWindowClassName = L"ResourceLoaderWindowClass";
+const LPCWSTR kResourceHandleWindowClassName = L"ResourceHandleWindowClass";
// Message types for internal use (keep in sync with kMessageHandlers)
enum {
requestCompleteMessage
};
-typedef void (ResourceLoader:: *ResourceLoaderEventHandler)(LPARAM);
-static const ResourceLoaderEventHandler messageHandlers[] = {
- &ResourceLoader::onHandleCreated,
- &ResourceLoader::onRequestRedirected,
- &ResourceLoader::onRequestComplete
+typedef void (ResourceHandle:: *ResourceHandleEventHandler)(LPARAM);
+static const ResourceHandleEventHandler messageHandlers[] = {
+ &ResourceHandle::onHandleCreated,
+ &ResourceHandle::onRequestRedirected,
+ &ResourceHandle::onRequestComplete
};
-static int addToOutstandingJobs(ResourceLoader* job)
+static int addToOutstandingJobs(ResourceHandle* job)
{
if (!jobIdMap)
- jobIdMap = new HashMap<int, ResourceLoader*>;
+ jobIdMap = new HashMap<int, ResourceHandle*>;
transferJobId++;
jobIdMap->set(transferJobId, job);
return transferJobId;
jobIdMap->remove(jobId);
}
-static ResourceLoader* lookupResourceLoader(int jobId)
+static ResourceHandle* lookupResourceHandle(int jobId)
{
if (!jobIdMap)
return 0;
return jobIdMap->get(jobId);
}
-static LRESULT CALLBACK ResourceLoaderWndProc(HWND hWnd, UINT message,
+static LRESULT CALLBACK ResourceHandleWndProc(HWND hWnd, UINT message,
WPARAM wParam, LPARAM lParam)
{
if (message >= handleCreatedMessage) {
UINT index = message - handleCreatedMessage;
if (index < _countof(messageHandlers)) {
unsigned jobId = (unsigned) wParam;
- ResourceLoader* job = lookupResourceLoader(jobId);
+ ResourceHandle* job = lookupResourceHandle(jobId);
if (job) {
ASSERT(job->d->m_jobId == jobId);
ASSERT(job->d->m_threadId == GetCurrentThreadId());
return DefWindowProc(hWnd, message, wParam, lParam);
}
-static void initializeOffScreenResourceLoaderWindow()
+static void initializeOffScreenResourceHandleWindow()
{
if (transferJobWindowHandle)
return;
WNDCLASSEX wcex;
memset(&wcex, 0, sizeof(WNDCLASSEX));
wcex.cbSize = sizeof(WNDCLASSEX);
- wcex.lpfnWndProc = ResourceLoaderWndProc;
+ wcex.lpfnWndProc = ResourceHandleWndProc;
wcex.hInstance = Page::instanceHandle();
- wcex.lpszClassName = kResourceLoaderWindowClassName;
+ wcex.lpszClassName = kResourceHandleWindowClassName;
RegisterClassEx(&wcex);
- transferJobWindowHandle = CreateWindow(kResourceLoaderWindowClassName, 0, 0, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0,
+ transferJobWindowHandle = CreateWindow(kResourceHandleWindowClassName, 0, 0, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0,
HWND_MESSAGE, 0, Page::instanceHandle(), 0);
}
-ResourceLoaderInternal::~ResourceLoaderInternal()
+ResourceHandleInternal::~ResourceHandleInternal()
{
if (m_fileHandle != INVALID_HANDLE_VALUE)
CloseHandle(m_fileHandle);
}
-ResourceLoader::~ResourceLoader()
+ResourceHandle::~ResourceHandle()
{
if (d->m_jobId)
removeFromOutstandingJobs(d->m_jobId);
}
-void ResourceLoader::onHandleCreated(LPARAM lParam)
+void ResourceHandle::onHandleCreated(LPARAM lParam)
{
if (!d->m_resourceHandle) {
d->m_resourceHandle = HINTERNET(lParam);
}
}
-void ResourceLoader::onRequestRedirected(LPARAM lParam)
+void ResourceHandle::onRequestRedirected(LPARAM lParam)
{
// If already canceled, then ignore this event.
if (d->status != 0)
client()->receivedRedirect(this, url);
}
-void ResourceLoader::onRequestComplete(LPARAM lParam)
+void ResourceHandle::onRequestComplete(LPARAM lParam)
{
if (d->m_writing) {
DWORD bytesWritten;
PostMessage(transferJobWindowHandle, msg, (WPARAM) jobId, lParam);
}
-bool ResourceLoader::start(DocLoader* docLoader)
+bool ResourceHandle::start(DocLoader* docLoader)
{
ref();
if (d->URL.isLocalFile()) {
}
static INTERNET_STATUS_CALLBACK callbackHandle = InternetSetStatusCallback(internetHandle, transferJobStatusCallback);
- initializeOffScreenResourceLoaderWindow();
+ initializeOffScreenResourceHandleWindow();
d->m_jobId = addToOutstandingJobs(this);
// For form posting, we can't use InternetOpenURL. We have to use InternetConnect followed by
}
}
-void ResourceLoader::fileLoadTimer(Timer<ResourceLoader>* timer)
+void ResourceHandle::fileLoadTimer(Timer<ResourceHandle>* timer)
{
d->client->receivedResponse(this, 0);
d->client->didFinishLoading(this);
}
-void ResourceLoader::cancel()
+void ResourceHandle::cancel()
{
if (d->m_resourceHandle)
InternetCloseHandle(d->m_resourceHandle);
setError(1);
}
-void ResourceLoader::setHasReceivedResponse(bool b)
+void ResourceHandle::setHasReceivedResponse(bool b)
{
d->m_hasReceivedResponse = b;
}
-bool ResourceLoader::hasReceivedResponse() const
+bool ResourceHandle::hasReceivedResponse() const
{
return d->m_hasReceivedResponse;
}
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef ResourceLoaderWin_H
-#define ResourceLoaderWin_H
+#ifndef ResourceHandleWin_H
+#define ResourceHandleWin_H
#include <windows.h>
#include "EditorClientQt.h"
#include "FrameLoadRequest.h"
#include "DOMImplementation.h"
-#include "ResourceLoaderInternal.h"
+#include "ResourceHandleInternal.h"
#include "Document.h"
#include "Settings.h"
#include "Plugin.h"
#include "FramePrivate.h"
#include "GraphicsContext.h"
#include "HTMLDocument.h"
-#include "ResourceLoader.h"
+#include "ResourceHandle.h"
#include "PlatformMouseEvent.h"
#include "PlatformKeyboardEvent.h"
#include "PlatformWheelEvent.h"
#include "FrameQt.h"
#include "Document.h"
#include "FrameTree.h"
-#include "ResourceLoader.h"
+#include "ResourceHandle.h"
#include "LoaderFunctions.h"
-#include "ResourceLoaderInternal.h"
+#include "ResourceHandleInternal.h"
#include <kstdguiitem.h>
#include <kmessagebox.h>
m_assignedMimetype = false;
ResourceRequest request(url);
- RefPtr<ResourceLoader> loader = ResourceLoader::create(request, this, m_frame->document() ? m_frame->document()->docLoader() : 0);
+ RefPtr<ResourceHandle> loader = ResourceHandle::create(request, this, m_frame->document() ? m_frame->document()->docLoader() : 0);
}
void FrameQtClientDefault::submitForm(const String& method, const KURL& url, const FormData* postData)
request.setHTTPMethod(method);
request.setHTTPBody(*postData);
- RefPtr<ResourceLoader> loader = ResourceLoader::create(request, this, m_frame->document() ? m_frame->document()->docLoader() : 0);
+ RefPtr<ResourceHandle> loader = ResourceHandle::create(request, this, m_frame->document() ? m_frame->document()->docLoader() : 0);
}
void FrameQtClientDefault::checkLoaded()
// no-op
}
-void FrameQtClientDefault::receivedResponse(ResourceLoader*, PlatformResponse)
+void FrameQtClientDefault::receivedResponse(ResourceHandle*, PlatformResponse)
{
// no-op
}
-void FrameQtClientDefault::didReceiveData(ResourceLoader* job, const char* data, int length)
+void FrameQtClientDefault::didReceiveData(ResourceHandle* job, const char* data, int length)
{
- ResourceLoaderInternal* d = job->getInternal();
+ ResourceHandleInternal* d = job->getInternal();
ASSERT(d);
if (!m_assignedMimetype) {
return num;
}
-void FrameQtClientDefault::receivedAllData(ResourceLoader* job, PlatformData data)
+void FrameQtClientDefault::receivedAllData(ResourceHandle* job, PlatformData data)
{
ASSERT(m_frame);
#ifndef FrameQtClient_H
#define FrameQtClient_H
-#include "ResourceLoaderClient.h"
+#include "ResourceHandleClient.h"
namespace WebCore {
virtual void openURL(const KURL&) = 0;
virtual void submitForm(const String& method, const KURL&, const FormData*) = 0;
- // This is invoked after any ResourceLoader is done,
+ // This is invoked after any ResourceHandle is done,
// to check wheter all items to be loaded are finished.
virtual void checkLoaded() = 0;
};
class FrameQtClientDefault : public FrameQtClient,
- public ResourceLoaderClient
+ public ResourceHandleClient
{
public:
FrameQtClientDefault();
virtual void loadFinished() const;
- // ResourceLoaderClient
- virtual void receivedResponse(ResourceLoader*, PlatformResponse);
- virtual void didReceiveData(ResourceLoader*, const char*, int);
- virtual void receivedAllData(ResourceLoader*, PlatformData);
+ // ResourceHandleClient
+ virtual void receivedResponse(ResourceHandle*, PlatformResponse);
+ virtual void didReceiveData(ResourceHandle*, const char*, int);
+ virtual void receivedAllData(ResourceHandle*, PlatformData);
private:
// Internal helpers
#include "PlugInInfoStore.h"
#include "RenderTheme.h"
#include "FrameWin.h"
-#include "ResourceLoader.h"
-#include "ResourceLoaderClient.h"
+#include "ResourceHandle.h"
+#include "ResourceHandleClient.h"
#include "RenderThemeWin.h"
#include "TextBoundaries.h"
#include "AXObjectCache.h"
bool PlugInInfoStore::supportsMIMEType(const String&) { return false; }
void refreshPlugins(bool) { }
-void ResourceLoader::assembleResponseHeaders() const { }
-void ResourceLoader::retrieveResponseEncoding() const {}
+void ResourceHandle::assembleResponseHeaders() const { }
+void ResourceHandle::retrieveResponseEncoding() const {}
-Vector<char> ServeSynchronousRequest(Loader*, DocLoader*, ResourceLoader*, KURL&, DeprecatedString&) { notImplemented(); return Vector<char>(); }
+Vector<char> ServeSynchronousRequest(Loader*, DocLoader*, ResourceHandle*, KURL&, DeprecatedString&) { notImplemented(); return Vector<char>(); }
void CheckCacheObjectStatus(DocLoader*, CachedResource*) { }
bool CheckIfReloading(DocLoader*) { return false; }
#include "HTMLDocument.h"
#include "HTMLTokenizer.h"
#include "LoaderFunctions.h"
-#include "ResourceLoader.h"
+#include "ResourceHandle.h"
#include "Text.h"
#include "loader.h"
#include "markup.h"
#include "LoaderFunctions.h"
#include "PlatformString.h"
#include "RegularExpression.h"
-#include "ResourceLoader.h"
+#include "ResourceHandle.h"
#include "TextEncoding.h"
#include "kjs_binding.h"
#include <kjs/protect.h>
// create can return null here, for example if we're no longer attached to a page.
// this is true while running onunload handlers
// FIXME: Maybe create can return false for other reasons too?
- m_loader = ResourceLoader::create(request, this, m_doc->docLoader());
+ m_loader = ResourceHandle::create(request, this, m_doc->docLoader());
}
void XMLHttpRequest::abort()
didFinishLoading(0);
}
-void XMLHttpRequest::didFinishLoading(ResourceLoader* loader)
+void XMLHttpRequest::didFinishLoading(ResourceHandle* loader)
{
ASSERT(loader == m_loader);
}
}
-void XMLHttpRequest::receivedRedirect(ResourceLoader*, const KURL& m_url)
+void XMLHttpRequest::receivedRedirect(ResourceHandle*, const KURL& m_url)
{
if (!urlMatchesDocumentDomain(m_url))
abort();
}
-void XMLHttpRequest::didReceiveData(ResourceLoader*, const char* data, int len)
+void XMLHttpRequest::didReceiveData(ResourceHandle*, const char* data, int len)
{
if (m_responseHeaders.isEmpty() && m_loader)
m_responseHeaders = m_loader->responseHTTPHeadersAsString();
#include <wtf/HashMap.h>
#include <wtf/Vector.h>
#include "KURL.h"
-#include "ResourceLoaderClient.h"
+#include "ResourceHandleClient.h"
#include "PlatformString.h"
#include "HTTPHeaderMap.h"
#include "StringHash.h"
Loaded = 4 // The data transfer has been completed.
};
-class XMLHttpRequest : public Shared<XMLHttpRequest>, ResourceLoaderClient {
+class XMLHttpRequest : public Shared<XMLHttpRequest>, ResourceHandleClient {
public:
XMLHttpRequest(Document*);
~XMLHttpRequest();
private:
bool urlMatchesDocumentDomain(const KURL&) const;
- virtual void receivedRedirect(ResourceLoader*, const KURL&);
- virtual void didReceiveData(ResourceLoader*, const char* data, int size);
- virtual void didFinishLoading(ResourceLoader*);
+ virtual void receivedRedirect(ResourceHandle*, const KURL&);
+ virtual void didReceiveData(ResourceHandle*, const char* data, int size);
+ virtual void didFinishLoading(ResourceHandle*);
void processSyncLoadResults(const Vector<char>& data, const KURL& finalURL, const DeprecatedString& headers);
bool m_async;
HTTPHeaderMap m_requestHeaders;
- RefPtr<ResourceLoader> m_loader;
+ RefPtr<ResourceHandle> m_loader;
XMLHttpRequestState m_state;
git://git.webkit.org / WebKit-https.git / commitdiff