Commit 17d66c6d authored by abarth@webkit.org's avatar abarth@webkit.org

2010-09-08 Adam Barth <abarth@webkit.org>

        Rubber-stamped by Eric Seidel.

        Rename DocLoader to CachedResourceLoader because that's what it does.

        * WebDataSource.cpp:
2010-09-08  Adam Barth  <abarth@webkit.org>

        Rubber-stamped by Eric Seidel.

        Rename DocLoader to CachedResourceLoader because that's what it does.

        * WebView/WebFrame.mm:
2010-09-08  Adam Barth  <abarth@webkit.org>

        Rubber-stamped by Eric Seidel.

        Rename DocLoader to CachedResourceLoader because that's what it does.

        * Android.mk:
        * CMakeLists.txt:
        * GNUmakefile.am:
        * WebCore.gypi:
        * WebCore.pro:
        * WebCore.vcproj/WebCore.vcproj:
        * WebCore.xcodeproj/project.pbxproj:
        * css/CSSCursorImageValue.cpp:
        (WebCore::CSSCursorImageValue::cachedImage):
        * css/CSSCursorImageValue.h:
        * css/CSSFontFaceSource.cpp:
        (WebCore::CSSFontFaceSource::getFontData):
        * css/CSSFontSelector.cpp:
        (WebCore::CSSFontSelector::cachedResourceLoader):
        (WebCore::CSSFontSelector::addFontFaceRule):
        * css/CSSFontSelector.h:
        * css/CSSImageValue.cpp:
        (WebCore::CSSImageValue::cachedImage):
        * css/CSSImageValue.h:
        * css/CSSImportRule.cpp:
        (WebCore::CSSImportRule::insertedIntoParent):
        * css/CSSStyleSelector.cpp:
        (WebCore::CSSStyleSelector::loadPendingImages):
        * css/CSSStyleSheet.h:
        * dom/Document.cpp:
        (WebCore::Document::Document):
        (WebCore::Document::~Document):
        (WebCore::Document::implicitClose):
        * dom/Document.h:
        (WebCore::Document::cachedResourceLoader):
        * dom/ProcessingInstruction.cpp:
        (WebCore::ProcessingInstruction::checkStyleSheet):
        * dom/ScriptElement.cpp:
        (WebCore::ScriptElementData::requestScript):
        * dom/XMLDocumentParser.cpp:
        * dom/XMLDocumentParser.h:
        * dom/XMLDocumentParserLibxml2.cpp:
        (WebCore::matchFunc):
        (WebCore::shouldAllowExternalLoad):
        (WebCore::openFunc):
        (WebCore::XMLDocumentParser::doWrite):
        (WebCore::XMLDocumentParser::endElementNs):
        (WebCore::XMLDocumentParser::initializeParserContext):
        (WebCore::XMLDocumentParser::doEnd):
        (WebCore::xmlDocPtrForString):
        * dom/XMLDocumentParserQt.cpp:
        (WebCore::XMLDocumentParser::parseEndElement):
        * dom/XMLDocumentParserScope.cpp:
        (WebCore::XMLDocumentParserScope::XMLDocumentParserScope):
        (WebCore::XMLDocumentParserScope::~XMLDocumentParserScope):
        * dom/XMLDocumentParserScope.h:
        * editing/Editor.cpp:
        (WebCore::Editor::paste):
        * editing/mac/EditorMac.mm:
        (WebCore::Editor::paste):
        * html/HTMLLinkElement.cpp:
        (WebCore::HTMLLinkElement::process):
        * html/parser/CSSPreloadScanner.cpp:
        (WebCore::CSSPreloadScanner::emitRule):
        * html/parser/HTMLPreloadScanner.cpp:
        (WebCore::HTMLNames::PreloadTask::preload):
        * html/parser/HTMLScriptRunner.cpp:
        (WebCore::HTMLScriptRunner::requestPendingScript):
        * inspector/InspectorResource.cpp:
        (WebCore::InspectorResource::cachedResource):
        * loader/Cache.cpp:
        (WebCore::Cache::requestResource):
        (WebCore::Cache::requestUserCSSStyleSheet):
        (WebCore::Cache::revalidateResource):
        (WebCore::Cache::addCachedResourceLoader):
        (WebCore::Cache::removeCachedResourceLoader):
        * loader/Cache.h:
        * loader/CachedCSSStyleSheet.h:
        * loader/CachedFont.cpp:
        (WebCore::CachedFont::load):
        (WebCore::CachedFont::beginLoadIfNeeded):
        * loader/CachedFont.h:
        * loader/CachedImage.cpp:
        (WebCore::CachedImage::load):
        (WebCore::CachedImage::maximumDecodedImageSize):
        * loader/CachedImage.h:
        * loader/CachedResource.cpp:
        (WebCore::CachedResource::CachedResource):
        (WebCore::CachedResource::~CachedResource):
        (WebCore::CachedResource::load):
        * loader/CachedResource.h:
        (WebCore::CachedResource::load):
        (WebCore::CachedResource::setCachedResourceLoader):
        * loader/CachedResourceLoader.cpp: Copied from WebCore/loader/DocLoader.cpp.
        (WebCore::CachedResourceLoader::CachedResourceLoader):
        (WebCore::CachedResourceLoader::~CachedResourceLoader):
        (WebCore::CachedResourceLoader::frame):
        (WebCore::CachedResourceLoader::checkForReload):
        (WebCore::CachedResourceLoader::requestImage):
        (WebCore::CachedResourceLoader::requestFont):
        (WebCore::CachedResourceLoader::requestCSSStyleSheet):
        (WebCore::CachedResourceLoader::requestUserCSSStyleSheet):
        (WebCore::CachedResourceLoader::requestScript):
        (WebCore::CachedResourceLoader::requestXSLStyleSheet):
        (WebCore::CachedResourceLoader::requestLinkPrefetch):
        (WebCore::CachedResourceLoader::canRequest):
        (WebCore::CachedResourceLoader::requestResource):
        (WebCore::CachedResourceLoader::printAccessDeniedMessage):
        (WebCore::CachedResourceLoader::setAutoLoadImages):
        (WebCore::CachedResourceLoader::cachePolicy):
        (WebCore::CachedResourceLoader::removeCachedResource):
        (WebCore::CachedResourceLoader::setLoadInProgress):
        (WebCore::CachedResourceLoader::checkCacheObjectStatus):
        (WebCore::CachedResourceLoader::incrementRequestCount):
        (WebCore::CachedResourceLoader::decrementRequestCount):
        (WebCore::CachedResourceLoader::requestCount):
        (WebCore::CachedResourceLoader::preload):
        (WebCore::CachedResourceLoader::checkForPendingPreloads):
        (WebCore::CachedResourceLoader::requestPreload):
        (WebCore::CachedResourceLoader::clearPreloads):
        (WebCore::CachedResourceLoader::clearPendingPreloads):
        (WebCore::CachedResourceLoader::printPreloadStats):
        * loader/CachedResourceLoader.h: Copied from WebCore/loader/DocLoader.h.
        * loader/CachedScript.h:
        * loader/CachedXSLStyleSheet.h:
        * loader/DocLoader.cpp: Removed.
        * loader/DocLoader.h: Removed.
        * loader/DocumentLoader.cpp:
        (WebCore::DocumentLoader::isLoadingInAPISense):
        (WebCore::DocumentLoader::subresource):
        (WebCore::DocumentLoader::getSubresources):
        * loader/FrameLoader.cpp:
        (WebCore::numRequests):
        (WebCore::FrameLoader::stopLoading):
        (WebCore::FrameLoader::didBeginDocument):
        * loader/HistoryController.cpp:
        (WebCore::HistoryController::createItem):
        * loader/ImageLoader.cpp:
        (WebCore::ImageLoader::updateFromElement):
        * loader/Request.cpp:
        (WebCore::Request::Request):
        * loader/Request.h:
        (WebCore::Request::cachedResourceLoader):
        * loader/loader.cpp:
        (WebCore::Loader::load):
        (WebCore::Loader::cancelRequests):
        (WebCore::Loader::Host::servePendingRequests):
        (WebCore::Loader::Host::didFinishLoading):
        (WebCore::Loader::Host::didFail):
        (WebCore::Loader::Host::didReceiveResponse):
        (WebCore::Loader::Host::cancelPendingRequests):
        (WebCore::Loader::Host::cancelRequests):
        * loader/loader.h:
        * page/DragController.cpp:
        (WebCore::DragController::concludeEditDrag):
        * page/Frame.cpp:
        * page/FrameView.cpp:
        (WebCore::FrameView::checkStopDelayingDeferredRepaints):
        (WebCore::FrameView::updateDeferredRepaintDelay):
        * page/Settings.cpp:
        (WebCore::setLoadsImagesAutomaticallyInAllFrames):
        * platform/android/TemporaryLinkStubs.cpp:
        (WebCore::CheckCacheObjectStatus):
        * platform/network/android/ResourceHandleAndroid.cpp:
        (WebCore::ResourceHandle::start):
        * platform/network/cf/ResourceHandleCFNet.cpp:
        * platform/network/curl/ResourceHandleCurl.cpp:
        * platform/network/mac/ResourceHandleMac.mm:
        * platform/network/qt/ResourceHandleQt.cpp:
        * platform/network/soup/ResourceHandleSoup.cpp:
        * platform/network/win/ResourceHandleWin.cpp:
        * svg/SVGFEImageElement.cpp:
        (WebCore::SVGFEImageElement::requestImageResource):
        * svg/SVGFontFaceUriElement.cpp:
        (WebCore::SVGFontFaceUriElement::loadFont):
        * workers/Worker.cpp:
        * xml/XSLImportRule.cpp:
        (WebCore::XSLImportRule::loadSheet):
        * xml/XSLStyleSheet.h:
        * xml/XSLStyleSheetLibxslt.cpp:
        (WebCore::XSLStyleSheet::cachedResourceLoader):
        (WebCore::XSLStyleSheet::parseString):
        * xml/XSLStyleSheetQt.cpp:
        (WebCore::XSLStyleSheet::cachedResourceLoader):
        * xml/XSLTProcessor.cpp:
        * xml/XSLTProcessorLibxslt.cpp:
        (WebCore::docLoaderFunc):
        (WebCore::setXSLTLoadCallBack):
        (WebCore::xmlDocPtrFromNode):
        (WebCore::XSLTProcessor::transformToString):
2010-09-08  Adam Barth  <abarth@webkit.org>

        Rubber-stamped by Eric Seidel.

        Rename DocLoader to CachedResourceLoader because that's what it does.

        * Scripts/do-webcore-rename:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66963 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent ab108614
......@@ -315,7 +315,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
loader/CachedScript.cpp \
loader/CrossOriginAccessControl.cpp \
loader/CrossOriginPreflightResultCache.cpp \
loader/DocLoader.cpp \
loader/CachedResourceLoader.cpp \
loader/DocumentLoader.cpp \
loader/DocumentThreadableLoader.cpp \
loader/DocumentWriter.cpp \
......
......@@ -1083,7 +1083,7 @@ SET(WebCore_SOURCES
loader/CachedXSLStyleSheet.cpp
loader/CrossOriginAccessControl.cpp
loader/CrossOriginPreflightResultCache.cpp
loader/DocLoader.cpp
loader/CachedResourceLoader.cpp
loader/DocumentLoader.cpp
loader/DocumentThreadableLoader.cpp
loader/DocumentWriter.cpp
......
2010-09-08 Adam Barth <abarth@webkit.org>
Rubber-stamped by Eric Seidel.
Rename DocLoader to CachedResourceLoader because that's what it does.
* Android.mk:
* CMakeLists.txt:
* GNUmakefile.am:
* WebCore.gypi:
* WebCore.pro:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* css/CSSCursorImageValue.cpp:
(WebCore::CSSCursorImageValue::cachedImage):
* css/CSSCursorImageValue.h:
* css/CSSFontFaceSource.cpp:
(WebCore::CSSFontFaceSource::getFontData):
* css/CSSFontSelector.cpp:
(WebCore::CSSFontSelector::cachedResourceLoader):
(WebCore::CSSFontSelector::addFontFaceRule):
* css/CSSFontSelector.h:
* css/CSSImageValue.cpp:
(WebCore::CSSImageValue::cachedImage):
* css/CSSImageValue.h:
* css/CSSImportRule.cpp:
(WebCore::CSSImportRule::insertedIntoParent):
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::loadPendingImages):
* css/CSSStyleSheet.h:
* dom/Document.cpp:
(WebCore::Document::Document):
(WebCore::Document::~Document):
(WebCore::Document::implicitClose):
* dom/Document.h:
(WebCore::Document::cachedResourceLoader):
* dom/ProcessingInstruction.cpp:
(WebCore::ProcessingInstruction::checkStyleSheet):
* dom/ScriptElement.cpp:
(WebCore::ScriptElementData::requestScript):
* dom/XMLDocumentParser.cpp:
* dom/XMLDocumentParser.h:
* dom/XMLDocumentParserLibxml2.cpp:
(WebCore::matchFunc):
(WebCore::shouldAllowExternalLoad):
(WebCore::openFunc):
(WebCore::XMLDocumentParser::doWrite):
(WebCore::XMLDocumentParser::endElementNs):
(WebCore::XMLDocumentParser::initializeParserContext):
(WebCore::XMLDocumentParser::doEnd):
(WebCore::xmlDocPtrForString):
* dom/XMLDocumentParserQt.cpp:
(WebCore::XMLDocumentParser::parseEndElement):
* dom/XMLDocumentParserScope.cpp:
(WebCore::XMLDocumentParserScope::XMLDocumentParserScope):
(WebCore::XMLDocumentParserScope::~XMLDocumentParserScope):
* dom/XMLDocumentParserScope.h:
* editing/Editor.cpp:
(WebCore::Editor::paste):
* editing/mac/EditorMac.mm:
(WebCore::Editor::paste):
* html/HTMLLinkElement.cpp:
(WebCore::HTMLLinkElement::process):
* html/parser/CSSPreloadScanner.cpp:
(WebCore::CSSPreloadScanner::emitRule):
* html/parser/HTMLPreloadScanner.cpp:
(WebCore::HTMLNames::PreloadTask::preload):
* html/parser/HTMLScriptRunner.cpp:
(WebCore::HTMLScriptRunner::requestPendingScript):
* inspector/InspectorResource.cpp:
(WebCore::InspectorResource::cachedResource):
* loader/Cache.cpp:
(WebCore::Cache::requestResource):
(WebCore::Cache::requestUserCSSStyleSheet):
(WebCore::Cache::revalidateResource):
(WebCore::Cache::addCachedResourceLoader):
(WebCore::Cache::removeCachedResourceLoader):
* loader/Cache.h:
* loader/CachedCSSStyleSheet.h:
* loader/CachedFont.cpp:
(WebCore::CachedFont::load):
(WebCore::CachedFont::beginLoadIfNeeded):
* loader/CachedFont.h:
* loader/CachedImage.cpp:
(WebCore::CachedImage::load):
(WebCore::CachedImage::maximumDecodedImageSize):
* loader/CachedImage.h:
* loader/CachedResource.cpp:
(WebCore::CachedResource::CachedResource):
(WebCore::CachedResource::~CachedResource):
(WebCore::CachedResource::load):
* loader/CachedResource.h:
(WebCore::CachedResource::load):
(WebCore::CachedResource::setCachedResourceLoader):
* loader/CachedResourceLoader.cpp: Copied from WebCore/loader/DocLoader.cpp.
(WebCore::CachedResourceLoader::CachedResourceLoader):
(WebCore::CachedResourceLoader::~CachedResourceLoader):
(WebCore::CachedResourceLoader::frame):
(WebCore::CachedResourceLoader::checkForReload):
(WebCore::CachedResourceLoader::requestImage):
(WebCore::CachedResourceLoader::requestFont):
(WebCore::CachedResourceLoader::requestCSSStyleSheet):
(WebCore::CachedResourceLoader::requestUserCSSStyleSheet):
(WebCore::CachedResourceLoader::requestScript):
(WebCore::CachedResourceLoader::requestXSLStyleSheet):
(WebCore::CachedResourceLoader::requestLinkPrefetch):
(WebCore::CachedResourceLoader::canRequest):
(WebCore::CachedResourceLoader::requestResource):
(WebCore::CachedResourceLoader::printAccessDeniedMessage):
(WebCore::CachedResourceLoader::setAutoLoadImages):
(WebCore::CachedResourceLoader::cachePolicy):
(WebCore::CachedResourceLoader::removeCachedResource):
(WebCore::CachedResourceLoader::setLoadInProgress):
(WebCore::CachedResourceLoader::checkCacheObjectStatus):
(WebCore::CachedResourceLoader::incrementRequestCount):
(WebCore::CachedResourceLoader::decrementRequestCount):
(WebCore::CachedResourceLoader::requestCount):
(WebCore::CachedResourceLoader::preload):
(WebCore::CachedResourceLoader::checkForPendingPreloads):
(WebCore::CachedResourceLoader::requestPreload):
(WebCore::CachedResourceLoader::clearPreloads):
(WebCore::CachedResourceLoader::clearPendingPreloads):
(WebCore::CachedResourceLoader::printPreloadStats):
* loader/CachedResourceLoader.h: Copied from WebCore/loader/DocLoader.h.
* loader/CachedScript.h:
* loader/CachedXSLStyleSheet.h:
* loader/DocLoader.cpp: Removed.
* loader/DocLoader.h: Removed.
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::isLoadingInAPISense):
(WebCore::DocumentLoader::subresource):
(WebCore::DocumentLoader::getSubresources):
* loader/FrameLoader.cpp:
(WebCore::numRequests):
(WebCore::FrameLoader::stopLoading):
(WebCore::FrameLoader::didBeginDocument):
* loader/HistoryController.cpp:
(WebCore::HistoryController::createItem):
* loader/ImageLoader.cpp:
(WebCore::ImageLoader::updateFromElement):
* loader/Request.cpp:
(WebCore::Request::Request):
* loader/Request.h:
(WebCore::Request::cachedResourceLoader):
* loader/loader.cpp:
(WebCore::Loader::load):
(WebCore::Loader::cancelRequests):
(WebCore::Loader::Host::servePendingRequests):
(WebCore::Loader::Host::didFinishLoading):
(WebCore::Loader::Host::didFail):
(WebCore::Loader::Host::didReceiveResponse):
(WebCore::Loader::Host::cancelPendingRequests):
(WebCore::Loader::Host::cancelRequests):
* loader/loader.h:
* page/DragController.cpp:
(WebCore::DragController::concludeEditDrag):
* page/Frame.cpp:
* page/FrameView.cpp:
(WebCore::FrameView::checkStopDelayingDeferredRepaints):
(WebCore::FrameView::updateDeferredRepaintDelay):
* page/Settings.cpp:
(WebCore::setLoadsImagesAutomaticallyInAllFrames):
* platform/android/TemporaryLinkStubs.cpp:
(WebCore::CheckCacheObjectStatus):
* platform/network/android/ResourceHandleAndroid.cpp:
(WebCore::ResourceHandle::start):
* platform/network/cf/ResourceHandleCFNet.cpp:
* platform/network/curl/ResourceHandleCurl.cpp:
* platform/network/mac/ResourceHandleMac.mm:
* platform/network/qt/ResourceHandleQt.cpp:
* platform/network/soup/ResourceHandleSoup.cpp:
* platform/network/win/ResourceHandleWin.cpp:
* svg/SVGFEImageElement.cpp:
(WebCore::SVGFEImageElement::requestImageResource):
* svg/SVGFontFaceUriElement.cpp:
(WebCore::SVGFontFaceUriElement::loadFont):
* workers/Worker.cpp:
* xml/XSLImportRule.cpp:
(WebCore::XSLImportRule::loadSheet):
* xml/XSLStyleSheet.h:
* xml/XSLStyleSheetLibxslt.cpp:
(WebCore::XSLStyleSheet::cachedResourceLoader):
(WebCore::XSLStyleSheet::parseString):
* xml/XSLStyleSheetQt.cpp:
(WebCore::XSLStyleSheet::cachedResourceLoader):
* xml/XSLTProcessor.cpp:
* xml/XSLTProcessorLibxslt.cpp:
(WebCore::docLoaderFunc):
(WebCore::setXSLTLoadCallBack):
(WebCore::xmlDocPtrFromNode):
(WebCore::XSLTProcessor::transformToString):
2010-09-06 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
Reviewed by Eric Carlson.
......@@ -1675,8 +1675,8 @@ webcore_sources += \
WebCore/loader/CrossOriginAccessControl.h \
WebCore/loader/CrossOriginPreflightResultCache.cpp \
WebCore/loader/CrossOriginPreflightResultCache.h \
WebCore/loader/DocLoader.cpp \
WebCore/loader/DocLoader.h \
WebCore/loader/CachedResourceLoader.cpp \
WebCore/loader/CachedResourceLoader.h \
WebCore/loader/DocumentLoadTiming.h \
WebCore/loader/DocumentLoader.cpp \
WebCore/loader/DocumentLoader.h \
......
......@@ -1894,8 +1894,8 @@
'loader/CrossOriginAccessControl.h',
'loader/CrossOriginPreflightResultCache.cpp',
'loader/CrossOriginPreflightResultCache.h',
'loader/DocLoader.cpp',
'loader/DocLoader.h',
'loader/CachedResourceLoader.cpp',
'loader/CachedResourceLoader.h',
'loader/DocumentLoadTiming.h',
'loader/DocumentLoader.cpp',
'loader/DocumentLoader.h',
......
......@@ -788,7 +788,7 @@ SOURCES += \
loader/CachedXSLStyleSheet.cpp \
loader/CrossOriginAccessControl.cpp \
loader/CrossOriginPreflightResultCache.cpp \
loader/DocLoader.cpp \
loader/CachedResourceLoader.cpp \
loader/DocumentLoader.cpp \
loader/DocumentThreadableLoader.cpp \
loader/DocumentWriter.cpp \
......@@ -1584,7 +1584,7 @@ HEADERS += \
loader/Cache.h \
loader/CrossOriginAccessControl.h \
loader/CrossOriginPreflightResultCache.h \
loader/DocLoader.h \
loader/CachedResourceLoader.h \
loader/DocumentLoader.h \
loader/DocumentThreadableLoader.h \
loader/FormState.h \
......
......@@ -23497,11 +23497,11 @@
>
</File>
<File
RelativePath="..\loader\DocLoader.cpp"
RelativePath="..\loader\CachedResourceLoader.cpp"
>
</File>
<File
RelativePath="..\loader\DocLoader.h"
RelativePath="..\loader\CachedResourceLoader.h"
>
</File>
<File
......@@ -4877,8 +4877,8 @@
BCB16C240979C3BD00467741 /* CachedScript.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB16C0B0979C3BD00467741 /* CachedScript.h */; };
BCB16C270979C3BD00467741 /* CachedXSLStyleSheet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB16C0E0979C3BD00467741 /* CachedXSLStyleSheet.cpp */; };
BCB16C280979C3BD00467741 /* CachedXSLStyleSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB16C0F0979C3BD00467741 /* CachedXSLStyleSheet.h */; };
BCB16C290979C3BD00467741 /* DocLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB16C100979C3BD00467741 /* DocLoader.cpp */; };
BCB16C2A0979C3BD00467741 /* DocLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB16C110979C3BD00467741 /* DocLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
BCB16C290979C3BD00467741 /* CachedResourceLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB16C100979C3BD00467741 /* CachedResourceLoader.cpp */; };
BCB16C2A0979C3BD00467741 /* CachedResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB16C110979C3BD00467741 /* CachedResourceLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
BCB16C2C0979C3BD00467741 /* loader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB16C130979C3BD00467741 /* loader.cpp */; };
BCB16C2D0979C3BD00467741 /* loader.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB16C140979C3BD00467741 /* loader.h */; settings = {ATTRIBUTES = (Private, ); }; };
BCB16C2E0979C3BD00467741 /* Request.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB16C150979C3BD00467741 /* Request.cpp */; };
......@@ -10682,8 +10682,8 @@
BCB16C0B0979C3BD00467741 /* CachedScript.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CachedScript.h; sourceTree = "<group>"; };
BCB16C0E0979C3BD00467741 /* CachedXSLStyleSheet.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CachedXSLStyleSheet.cpp; sourceTree = "<group>"; };
BCB16C0F0979C3BD00467741 /* CachedXSLStyleSheet.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CachedXSLStyleSheet.h; sourceTree = "<group>"; };
BCB16C100979C3BD00467741 /* DocLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DocLoader.cpp; sourceTree = "<group>"; };
BCB16C110979C3BD00467741 /* DocLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DocLoader.h; sourceTree = "<group>"; };
BCB16C100979C3BD00467741 /* CachedResourceLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CachedResourceLoader.cpp; sourceTree = "<group>"; };
BCB16C110979C3BD00467741 /* CachedResourceLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CachedResourceLoader.h; sourceTree = "<group>"; };
BCB16C130979C3BD00467741 /* loader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = loader.cpp; sourceTree = "<group>"; };
BCB16C140979C3BD00467741 /* loader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = loader.h; sourceTree = "<group>"; };
BCB16C150979C3BD00467741 /* Request.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Request.cpp; sourceTree = "<group>"; };
......@@ -16522,8 +16522,8 @@
E1C416110F6562FD0092D2FB /* CrossOriginAccessControl.h */,
E1C415DD0F655D7C0092D2FB /* CrossOriginPreflightResultCache.cpp */,
E1C415D90F655D6F0092D2FB /* CrossOriginPreflightResultCache.h */,
BCB16C100979C3BD00467741 /* DocLoader.cpp */,
BCB16C110979C3BD00467741 /* DocLoader.h */,
BCB16C100979C3BD00467741 /* CachedResourceLoader.cpp */,
BCB16C110979C3BD00467741 /* CachedResourceLoader.h */,
93E227DB0AF589AD00D48324 /* DocumentLoader.cpp */,
656D371E0ADBA5DE00A4554D /* DocumentLoader.h */,
8A12E35C11FA33280025836A /* DocumentLoadTiming.h */,
......@@ -17973,7 +17973,7 @@
59A8F1D611A69513001AC34A /* DeviceOrientationController.h in Headers */,
59A85EA4119D68EC00DEF1EF /* DeviceOrientationEvent.h in Headers */,
B2F34FE60E82F81400F627CD /* DNS.h in Headers */,
BCB16C2A0979C3BD00467741 /* DocLoader.h in Headers */,
BCB16C2A0979C3BD00467741 /* CachedResourceLoader.h in Headers */,
A8185F4009765766005826D9 /* Document.h in Headers */,
A8185F3D09765766005826D9 /* DocumentFragment.h in Headers */,
656D37360ADBA5DE00A4554D /* DocumentLoader.h in Headers */,
......@@ -20967,7 +20967,7 @@
59A8F1D411A69508001AC34A /* DeviceOrientationController.cpp in Sources */,
59A85EA2119D68D900DEF1EF /* DeviceOrientationEvent.cpp in Sources */,
B2F34FE90E82F82700F627CD /* DNSCFNet.cpp in Sources */,
BCB16C290979C3BD00467741 /* DocLoader.cpp in Sources */,
BCB16C290979C3BD00467741 /* CachedResourceLoader.cpp in Sources */,
A8185F3C09765766005826D9 /* Document.cpp in Sources */,
A8185F3F09765766005826D9 /* DocumentFragment.cpp in Sources */,
93E227E00AF589AD00D48324 /* DocumentLoader.cpp in Sources */,
......@@ -22,7 +22,7 @@
#include "config.h"
#include "CSSCursorImageValue.h"
#include "DocLoader.h"
#include "CachedResourceLoader.h"
#include "Document.h"
#include "PlatformString.h"
#include <wtf/MathExtras.h>
......@@ -111,7 +111,7 @@ bool CSSCursorImageValue::updateIfSVGCursorIsUsed(Element* element)
return false;
}
StyleCachedImage* CSSCursorImageValue::cachedImage(DocLoader* loader)
StyleCachedImage* CSSCursorImageValue::cachedImage(CachedResourceLoader* loader)
{
String url = getStringValue();
......
......@@ -42,7 +42,7 @@ public:
IntPoint hotSpot() const { return m_hotSpot; }
bool updateIfSVGCursorIsUsed(Element*);
virtual StyleCachedImage* cachedImage(DocLoader*);
virtual StyleCachedImage* cachedImage(CachedResourceLoader*);
#if ENABLE(SVG)
void removeReferencedElement(SVGElement*);
......
......@@ -29,7 +29,7 @@
#include "CachedFont.h"
#include "CSSFontFace.h"
#include "CSSFontSelector.h"
#include "DocLoader.h"
#include "CachedResourceLoader.h"
#include "FontCache.h"
#include "FontDescription.h"
#include "GlyphPageTreeNode.h"
......@@ -173,8 +173,8 @@ SimpleFontData* CSSFontFaceSource::getFontData(const FontDescription& fontDescri
}
} else {
// Kick off the load now.
if (DocLoader* docLoader = fontSelector->docLoader())
m_font->beginLoadIfNeeded(docLoader);
if (CachedResourceLoader* cachedResourceLoader = fontSelector->cachedResourceLoader())
m_font->beginLoadIfNeeded(cachedResourceLoader);
// FIXME: m_string is a URL so it makes no sense to pass it as a family name.
SimpleFontData* tempData = fontCache()->getCachedFontData(fontDescription, m_string);
if (!tempData)
......
......@@ -39,7 +39,7 @@
#include "CSSUnicodeRangeValue.h"
#include "CSSValueKeywords.h"
#include "CSSValueList.h"
#include "DocLoader.h"
#include "CachedResourceLoader.h"
#include "Document.h"
#include "FontCache.h"
#include "FontFamilyValue.h"
......@@ -80,9 +80,9 @@ bool CSSFontSelector::isEmpty() const
return m_fonts.isEmpty();
}
DocLoader* CSSFontSelector::docLoader() const
CachedResourceLoader* CSSFontSelector::cachedResourceLoader() const
{
return m_document ? m_document->docLoader() : 0;
return m_document ? m_document->cachedResourceLoader() : 0;
}
void CSSFontSelector::addFontFaceRule(const CSSFontFaceRule* fontFaceRule)
......@@ -245,7 +245,7 @@ void CSSFontSelector::addFontFaceRule(const CSSFontFaceRule* fontFaceRule)
Settings* settings = m_document ? m_document->frame() ? m_document->frame()->settings() : 0 : 0;
bool allowDownloading = foundSVGFont || (settings && settings->downloadableBinaryFontsEnabled());
if (allowDownloading && item->isSupportedFormat() && m_document) {
CachedFont* cachedFont = m_document->docLoader()->requestFont(item->resource());
CachedFont* cachedFont = m_document->cachedResourceLoader()->requestFont(item->resource());
if (cachedFont) {
#if ENABLE(SVG_FONTS)
if (foundSVGFont)
......
......@@ -38,7 +38,7 @@ class CSSFontFace;
class CSSFontFaceRule;
class CSSSegmentedFontFace;
class Document;
class DocLoader;
class CachedResourceLoader;
class FontDescription;
class CSSFontSelector : public FontSelector {
......@@ -60,7 +60,7 @@ public:
bool isEmpty() const;
DocLoader* docLoader() const;
CachedResourceLoader* cachedResourceLoader() const;
private:
CSSFontSelector(Document*);
......
......@@ -24,7 +24,7 @@
#include "CSSValueKeywords.h"
#include "Cache.h"
#include "CachedImage.h"
#include "DocLoader.h"
#include "CachedResourceLoader.h"
#include "StyleCachedImage.h"
#include "StylePendingImage.h"
......@@ -59,12 +59,12 @@ StyleImage* CSSImageValue::cachedOrPendingImage()
return m_image.get();
}
StyleCachedImage* CSSImageValue::cachedImage(DocLoader* loader)
StyleCachedImage* CSSImageValue::cachedImage(CachedResourceLoader* loader)
{
return cachedImage(loader, getStringValue());
}
StyleCachedImage* CSSImageValue::cachedImage(DocLoader* loader, const String& url)
StyleCachedImage* CSSImageValue::cachedImage(CachedResourceLoader* loader, const String& url)
{
if (!m_accessedImage) {
m_accessedImage = true;
......
......@@ -27,7 +27,7 @@
namespace WebCore {
class DocLoader;
class CachedResourceLoader;
class StyleCachedImage;
class StyleImage;
......@@ -37,7 +37,7 @@ public:
static PassRefPtr<CSSImageValue> create(const String& url) { return adoptRef(new CSSImageValue(url)); }
virtual ~CSSImageValue();
virtual StyleCachedImage* cachedImage(DocLoader*);
virtual StyleCachedImage* cachedImage(CachedResourceLoader*);
// Returns a StyleCachedImage if the image is cached already, otherwise a StylePendingImage.
StyleImage* cachedOrPendingImage();
......@@ -46,7 +46,7 @@ public:
protected:
CSSImageValue(const String& url);
StyleCachedImage* cachedImage(DocLoader*, const String& url);
StyleCachedImage* cachedImage(CachedResourceLoader*, const String& url);
String cachedImageURL();
void clearCachedImage();
......
......@@ -23,7 +23,7 @@
#include "CSSImportRule.h"
#include "CachedCSSStyleSheet.h"
#include "DocLoader.h"
#include "CachedResourceLoader.h"
#include "Document.h"
#include "SecurityOrigin.h"
#include "Settings.h"
......@@ -115,8 +115,8 @@ void CSSImportRule::insertedIntoParent()
if (!parentSheet)
return;
DocLoader* docLoader = parentSheet->document()->docLoader();
if (!docLoader)
CachedResourceLoader* cachedResourceLoader = parentSheet->document()->cachedResourceLoader();
if (!cachedResourceLoader)
return;
String absHref = m_strHref;
......@@ -135,9 +135,9 @@ void CSSImportRule::insertedIntoParent()
}
if (parentSheet->isUserStyleSheet())
m_cachedSheet = docLoader->requestUserCSSStyleSheet(absHref, parentSheet->charset());
m_cachedSheet = cachedResourceLoader->requestUserCSSStyleSheet(absHref, parentSheet->charset());
else
m_cachedSheet = docLoader->requestCSSStyleSheet(absHref, parentSheet->charset());
m_cachedSheet = cachedResourceLoader->requestCSSStyleSheet(absHref, parentSheet->charset());
if (m_cachedSheet) {
// if the import rule is issued dynamically, the sheet may be
// removed from the pending sheet count, so let the doc know
......
......@@ -6711,14 +6711,14 @@ void CSSStyleSelector::loadPendingImages()
for (HashSet<int>::const_iterator it = m_pendingImageProperties.begin(); it != end; ++it) {
CSSPropertyID currentProperty = static_cast<CSSPropertyID>(*it);
DocLoader* docLoader = m_element->document()->docLoader();
CachedResourceLoader* cachedResourceLoader = m_element->document()->cachedResourceLoader();
switch (currentProperty) {
case CSSPropertyBackgroundImage: {
for (FillLayer* backgroundLayer = m_style->accessBackgroundLayers(); backgroundLayer; backgroundLayer = backgroundLayer->next()) {
if (backgroundLayer->image() && backgroundLayer->image()->isPendingImage()) {
CSSImageValue* imageValue = static_cast<StylePendingImage*>(backgroundLayer->image())->cssImageValue();
backgroundLayer->setImage(imageValue->cachedImage(docLoader));
backgroundLayer->setImage(imageValue->cachedImage(cachedResourceLoader));
}
}
break;
......@@ -6728,7 +6728,7 @@ void CSSStyleSelector::loadPendingImages()
for (ContentData* contentData = const_cast<ContentData*>(m_style->contentData()); contentData; contentData = contentData->next()) {
if (contentData->isImage() && contentData->image()->isPendingImage()) {
CSSImageValue* imageValue = static_cast<StylePendingImage*>(contentData->image())->cssImageValue();
contentData->setImage(imageValue->cachedImage(docLoader));
contentData->setImage(imageValue->cachedImage(cachedResourceLoader));
}
}
break;
......@@ -6740,7 +6740,7 @@ void CSSStyleSelector::loadPendingImages()
CursorData& currentCursor = (*cursorList)[i];
if (currentCursor.image()->isPendingImage()) {
CSSImageValue* imageValue = static_cast<StylePendingImage*>(currentCursor.image())->cssImageValue();
currentCursor.setImage(imageValue->cachedImage(docLoader));
currentCursor.setImage(imageValue->cachedImage(cachedResourceLoader));
}
}
}
......@@ -6750,7 +6750,7 @@ void CSSStyleSelector::loadPendingImages()
case CSSPropertyListStyleImage: {
if (m_style->listStyleImage() && m_style->listStyleImage()->isPendingImage()) {
CSSImageValue* imageValue = static_cast<StylePendingImage*>(m_style->listStyleImage())->cssImageValue();
m_style->setListStyleImage(imageValue->cachedImage(docLoader));
m_style->setListStyleImage(imageValue->cachedImage(cachedResourceLoader));
}
break;
}
......@@ -6759,7 +6759,7 @@ void CSSStyleSelector::loadPendingImages()
const NinePieceImage& borderImage = m_style->borderImage();
if (borderImage.image() && borderImage.image()->isPendingImage()) {
CSSImageValue* imageValue = static_cast<StylePendingImage*>(borderImage.image())->cssImageValue();
m_style->setBorderImage(NinePieceImage(imageValue->cachedImage(docLoader), borderImage.slices(), borderImage.horizontalRule(), borderImage.verticalRule()));
m_style->setBorderImage(NinePieceImage(imageValue->cachedImage(cachedResourceLoader), borderImage.slices(), borderImage.horizontalRule(), borderImage.verticalRule()));
}
break;
}
......@@ -6768,7 +6768,7 @@ void CSSStyleSelector::loadPendingImages()
const NinePieceImage& maskImage = m_style->boxReflect()->mask();
if (maskImage.image() && maskImage.image()->isPendingImage()) {
CSSImageValue* imageValue = static_cast<StylePendingImage*>(maskImage.image())->cssImageValue();
m_style->boxReflect()->setMask(NinePieceImage(imageValue->cachedImage(docLoader), maskImage.slices(), maskImage.horizontalRule(), maskImage.verticalRule()));
m_style->boxReflect()->setMask(NinePieceImage(imageValue->cachedImage(cachedResourceLoader), maskImage.slices(), maskImage.horizontalRule(), maskImage.verticalRule()));
}
break;
}
......@@ -6777,7 +6777,7 @@ void CSSStyleSelector::loadPendingImages()
const NinePieceImage& maskBoxImage = m_style->maskBoxImage();
if (maskBoxImage.image() && maskBoxImage.image()->isPendingImage()) {
CSSImageValue* imageValue = static_cast<StylePendingImage*>(maskBoxImage.image())->cssImageValue();
m_style->setMaskBoxImage(NinePieceImage(imageValue->cachedImage(docLoader), maskBoxImage.slices(), maskBoxImage.horizontalRule(), maskBoxImage.verticalRule()));
m_style->setMaskBoxImage(NinePieceImage(imageValue->cachedImage(cachedResourceLoader), maskBoxImage.slices(), maskBoxImage.horizontalRule(), maskBoxImage.verticalRule()));
}
break;
}
......@@ -6786,7 +6786,7 @@ void CSSStyleSelector::loadPendingImages()
for (FillLayer* maskLayer = m_style->accessMaskLayers(); maskLayer; maskLayer = maskLayer->next()) {
if (maskLayer->image() && maskLayer->image()->isPendingImage()) {
CSSImageValue* imageValue = static_cast<StylePendingImage*>(maskLayer->image())->cssImageValue();
maskLayer->setImage(imageValue->cachedImage(docLoader));
maskLayer->setImage(imageValue->cachedImage(cachedResourceLoader));
}
}
break;
......
......@@ -29,7 +29,7 @@ namespace WebCore {
struct CSSNamespace;
class CSSParser;
class CSSRule;
class DocLoader;
class CachedResourceLoader;
class Document;
typedef int ExceptionCode;
......
......@@ -47,7 +47,7 @@
#include "DOMWindow.h"
#include "DeviceMotionEvent.h"
#include "DeviceOrientationEvent.h"
#include "DocLoader.h"
#include "CachedResourceLoader.h"
#include "DocumentFragment.h"
#include "DocumentLoader.h"
#include "DocumentType.h"
......@@ -425,7 +425,7 @@ Document::Document(Frame* frame, const KURL& url, bool isXHTML, bool isHTML)
m_markers = new DocumentMarkerController();
m_docLoader = new DocLoader(this);
m_cachedResourceLoader = new CachedResourceLoader(this);
m_visuallyOrdered = false;
m_bParsing = false;
......@@ -542,7 +542,7 @@ Document::~Document()
ASSERT(!m_parser || m_parser->refCount() == 1);
detachParser();
m_document = 0;
m_docLoader.clear();
m_cachedResourceLoader.clear();
m_renderArena.clear();
......@@ -1998,7 +1998,7 @@ void Document::implicitClose()
detachParser();
// Parser should have picked up all preloads by now
m_docLoader->clearPreloads();
m_cachedResourceLoader->clearPreloads();
// Create a head and a body if we don't have those yet (e.g. for about:blank).
if (!this->body() && isHTMLDocument()) {
......
......@@ -64,7 +64,7 @@ class DOMImplementation;
class DOMSelection;
class DOMWindow;
class DatabaseThread;
class DocLoader;
class CachedResourceLoader;
class DocumentFragment;
class DocumentType;
class DocumentWeakReference;
......@@ -509,7 +509,7 @@ public:
void pageSizeAndMarginsInPixels(int pageIndex, IntSize& pageSize, int& marginTop, int& marginRight, int& marginBottom, int& marginLeft);
static void updateStyleForAllDocuments(); // FIXME: Try to reduce the # of calls to this function.
DocLoader* docLoader() { return m_docLoader.get(); }
CachedResourceLoader* cachedResourceLoader() { return m_cachedResourceLoader.get(); }
virtual void attach();
virtual void detach();
......@@ -1072,7 +1072,7 @@ private:
bool m_didCalculateStyleSelector;
Frame* m_frame;
OwnPtr<DocLoader> m_docLoader;
OwnPtr<CachedResourceLoader> m_cachedResourceLoader;
RefPtr<DocumentParser> m_parser;
bool m_wellFormed;
......
......@@ -25,7 +25,7 @@
#include "CachedCSSStyleSheet.h"
#include "CachedXSLStyleSheet.h"
#include "Document.h"
#include "DocLoader.h"
#include "CachedResourceLoader.h"