- another round of renaming; and KWQ is dead
authordarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 9 Jul 2006 22:48:56 +0000 (22:48 +0000)
committerdarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 9 Jul 2006 22:48:56 +0000 (22:48 +0000)
        * WebCore.vcproj/WebCore/WebCore.vcproj: Remove paths for kwq and khtml directories.
        Move files to their new locations. Did rename.
        * WebCore.xcodeproj/project.pbxproj: Move files to their new locations. Did rename.
        * WebCoreSources.bkl: Did rename.
        * webcore-base.bkl: Removed kwq.

        * kwq/AccessibilityObjectCache.h: Removed.
        * kwq/AccessibilityObjectCache.mm: Removed.
        * kwq/FormDataMac.h: Removed.
        * kwq/FormDataMac.mm: Removed.
        * kwq/WebCoreAXObject.h: Removed.
        * kwq/WebCoreAXObject.mm: Removed.
        * kwq/WebCoreEditCommand.h: Removed.
        * kwq/WebCoreEditCommand.mm: Removed.
        * kwq/WebCorePageState.h: Removed.
        * kwq/WebCorePageState.mm: Removed.
        * kwq/WebCoreResourceLoaderImp.h: Removed.
        * kwq/WebCoreResourceLoaderImp.mm: Removed.

        * bridge/AXObjectCache.h: Added.
        * bridge/mac/AXObjectCacheMac.mm: Added.
        * bridge/mac/WebCoreAXObject.h: Added.
        * bridge/mac/WebCoreAXObject.mm: Added.

        * loader/CachedObject.cpp: Removed.
        * loader/CachedObject.h: Removed.
        * loader/CachedObjectClient.h: Removed.
        * loader/CachedObjectClientWalker.cpp: Removed.
        * loader/CachedObjectClientWalker.h: Removed.

        * loader/CachedResource.cpp: Added.
        * loader/CachedResource.h: Added.
        * loader/CachedResourceClient.h: Added.
        * loader/CachedResourceClientWalker.cpp: Added.
        * loader/CachedResourceClientWalker.h: Added.

        * bridge/mac/FrameMac.mm:
        * bridge/mac/WebCoreFrameBridge.mm:
        * css/CSSImageValue.h:
        * css/CSSImportRule.h:
        * dom/Document.cpp:
        * dom/Document.h:
        * dom/Notation.h:
        * dom/ProcessingInstruction.h:
        * dom/XMLTokenizer.cpp:
        * html/CanvasPattern.h:
        * html/HTMLDocument.h:
        * html/HTMLImageLoader.cpp:
        * html/HTMLImageLoader.h:
        * html/HTMLLinkElement.h:
        * html/HTMLScriptElement.cpp:
        * html/HTMLScriptElement.h:
        * html/HTMLTokenizer.cpp:
        * html/HTMLTokenizer.h:
        * kcanvas/KCanvasFilters.h:
        * ksvg2/svg/SVGCursorElement.cpp:
        * ksvg2/svg/SVGCursorElement.h:
        * ksvg2/svg/SVGFEImageElement.cpp:
        * ksvg2/svg/SVGFEImageElement.h:
        * loader/Cache.cpp:
        * loader/Cache.h:
        * loader/CachedCSSStyleSheet.cpp:
        * loader/CachedCSSStyleSheet.h:
        * loader/CachedImage.cpp:
        * loader/CachedImage.h:
        * loader/CachedScript.cpp:
        * loader/CachedScript.h:
        * loader/CachedXBLDocument.cpp:
        * loader/CachedXBLDocument.h:
        * loader/CachedXSLStyleSheet.cpp:
        * loader/CachedXSLStyleSheet.h:
        * loader/DocLoader.cpp:
        * loader/DocLoader.h:
        * loader/LoaderFunctions.h:
        * loader/Request.cpp:
        * loader/Request.h:
        * loader/loader.cpp:
        * loader/loader.h:
        * loader/mac/LoaderFunctionsMac.mm:
        * page/Frame.cpp:
        * page/FrameView.cpp:
        * platform/gdk/TemporaryLinkStubs.cpp:
        * platform/mac/ClipboardMac.h:
        * platform/win/TemporaryLinkStubs.cpp:
        * rendering/RenderBox.h:
        * rendering/RenderContainer.cpp:
        * rendering/RenderImage.cpp:
        * rendering/RenderImage.h:
        * rendering/RenderLayer.h:
        * rendering/RenderObject.cpp:
        * rendering/RenderObject.h:
        * rendering/RenderStyle.cpp:
        * rendering/RenderStyle.h:
        * xml/XSLImportRule.h:
        Did renaming.

        * platform/mac/can-convert.mm: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@15269 268f45cc-cd09-0410-ab3c-d52691b4dbfc

82 files changed:
WebCore/ChangeLog
WebCore/WebCore.vcproj/Image Viewer/Image Viewer.vcproj
WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/WebCoreSources.bkl
WebCore/bridge/AXObjectCache.h [moved from WebCore/kwq/AccessibilityObjectCache.h with 77% similarity]
WebCore/bridge/mac/AXObjectCacheMac.mm [moved from WebCore/kwq/AccessibilityObjectCache.mm with 83% similarity]
WebCore/bridge/mac/FormDataMac.h [moved from WebCore/kwq/FormDataMac.h with 100% similarity]
WebCore/bridge/mac/FormDataMac.mm [moved from WebCore/kwq/FormDataMac.mm with 100% similarity]
WebCore/bridge/mac/FrameMac.mm
WebCore/bridge/mac/WebCoreAXObject.h [moved from WebCore/kwq/WebCoreAXObject.h with 98% similarity]
WebCore/bridge/mac/WebCoreAXObject.mm [moved from WebCore/kwq/WebCoreAXObject.mm with 97% similarity]
WebCore/bridge/mac/WebCoreEditCommand.h [moved from WebCore/kwq/WebCoreEditCommand.h with 100% similarity]
WebCore/bridge/mac/WebCoreEditCommand.mm [moved from WebCore/kwq/WebCoreEditCommand.mm with 100% similarity]
WebCore/bridge/mac/WebCoreFrameBridge.mm
WebCore/bridge/mac/WebCorePageState.h [moved from WebCore/kwq/WebCorePageState.h with 100% similarity]
WebCore/bridge/mac/WebCorePageState.mm [moved from WebCore/kwq/WebCorePageState.mm with 100% similarity]
WebCore/bridge/mac/WebCoreResourceLoaderImp.h [moved from WebCore/kwq/WebCoreResourceLoaderImp.h with 100% similarity]
WebCore/bridge/mac/WebCoreResourceLoaderImp.mm [moved from WebCore/kwq/WebCoreResourceLoaderImp.mm with 100% similarity]
WebCore/css/CSSImageValue.h
WebCore/css/CSSImportRule.h
WebCore/dom/Document.cpp
WebCore/dom/Document.h
WebCore/dom/Notation.h
WebCore/dom/ProcessingInstruction.h
WebCore/dom/XMLTokenizer.cpp
WebCore/html/CanvasPattern.h
WebCore/html/HTMLDocument.h
WebCore/html/HTMLImageLoader.cpp
WebCore/html/HTMLImageLoader.h
WebCore/html/HTMLLinkElement.h
WebCore/html/HTMLScriptElement.cpp
WebCore/html/HTMLScriptElement.h
WebCore/html/HTMLTokenizer.cpp
WebCore/html/HTMLTokenizer.h
WebCore/kcanvas/KCanvasFilters.h
WebCore/ksvg2/svg/SVGCursorElement.cpp
WebCore/ksvg2/svg/SVGCursorElement.h
WebCore/ksvg2/svg/SVGFEImageElement.cpp
WebCore/ksvg2/svg/SVGFEImageElement.h
WebCore/loader/Cache.cpp
WebCore/loader/Cache.h
WebCore/loader/CachedCSSStyleSheet.cpp
WebCore/loader/CachedCSSStyleSheet.h
WebCore/loader/CachedImage.cpp
WebCore/loader/CachedImage.h
WebCore/loader/CachedResource.cpp [moved from WebCore/loader/CachedObject.cpp with 86% similarity]
WebCore/loader/CachedResource.h [moved from WebCore/loader/CachedObject.h with 90% similarity]
WebCore/loader/CachedResourceClient.h [moved from WebCore/loader/CachedObjectClient.h with 91% similarity]
WebCore/loader/CachedResourceClientWalker.cpp [moved from WebCore/loader/CachedObjectClientWalker.cpp with 83% similarity]
WebCore/loader/CachedResourceClientWalker.h [moved from WebCore/loader/CachedObjectClientWalker.h with 79% similarity]
WebCore/loader/CachedScript.cpp
WebCore/loader/CachedScript.h
WebCore/loader/CachedXBLDocument.cpp
WebCore/loader/CachedXBLDocument.h
WebCore/loader/CachedXSLStyleSheet.cpp
WebCore/loader/CachedXSLStyleSheet.h
WebCore/loader/DocLoader.cpp
WebCore/loader/DocLoader.h
WebCore/loader/LoaderFunctions.h
WebCore/loader/Request.cpp
WebCore/loader/Request.h
WebCore/loader/loader.cpp
WebCore/loader/loader.h
WebCore/loader/mac/LoaderFunctionsMac.mm
WebCore/page/Frame.cpp
WebCore/page/FrameView.cpp
WebCore/platform/gdk/TemporaryLinkStubs.cpp
WebCore/platform/mac/ClipboardMac.h
WebCore/platform/mac/can-convert.mm [deleted file]
WebCore/platform/win/TemporaryLinkStubs.cpp
WebCore/rendering/RenderBox.h
WebCore/rendering/RenderContainer.cpp
WebCore/rendering/RenderImage.cpp
WebCore/rendering/RenderImage.h
WebCore/rendering/RenderLayer.h
WebCore/rendering/RenderObject.cpp
WebCore/rendering/RenderObject.h
WebCore/rendering/RenderStyle.cpp
WebCore/rendering/RenderStyle.h
WebCore/webcore-base.bkl
WebCore/xml/XSLImportRule.h

index 494eb607ea1a32a37a06e82964a211d74475620b..09bf10dd3978643327141cd1688a25d31371b17b 100644 (file)
@@ -1,3 +1,105 @@
+2006-07-09  Darin Adler  <darin@apple.com>
+
+        - another round of renaming; and KWQ is dead
+
+        * WebCore.vcproj/WebCore/WebCore.vcproj: Remove paths for kwq and khtml directories.
+        Move files to their new locations. Did rename.
+        * WebCore.xcodeproj/project.pbxproj: Move files to their new locations. Did rename.
+        * WebCoreSources.bkl: Did rename.
+        * webcore-base.bkl: Removed kwq.
+
+        * kwq/AccessibilityObjectCache.h: Removed.
+        * kwq/AccessibilityObjectCache.mm: Removed.
+        * kwq/FormDataMac.h: Removed.
+        * kwq/FormDataMac.mm: Removed.
+        * kwq/WebCoreAXObject.h: Removed.
+        * kwq/WebCoreAXObject.mm: Removed.
+        * kwq/WebCoreEditCommand.h: Removed.
+        * kwq/WebCoreEditCommand.mm: Removed.
+        * kwq/WebCorePageState.h: Removed.
+        * kwq/WebCorePageState.mm: Removed.
+        * kwq/WebCoreResourceLoaderImp.h: Removed.
+        * kwq/WebCoreResourceLoaderImp.mm: Removed.
+
+        * bridge/AXObjectCache.h: Added.
+        * bridge/mac/AXObjectCacheMac.mm: Added.
+        * bridge/mac/WebCoreAXObject.h: Added.
+        * bridge/mac/WebCoreAXObject.mm: Added.
+
+        * loader/CachedObject.cpp: Removed.
+        * loader/CachedObject.h: Removed.
+        * loader/CachedObjectClient.h: Removed.
+        * loader/CachedObjectClientWalker.cpp: Removed.
+        * loader/CachedObjectClientWalker.h: Removed.
+
+        * loader/CachedResource.cpp: Added.
+        * loader/CachedResource.h: Added.
+        * loader/CachedResourceClient.h: Added.
+        * loader/CachedResourceClientWalker.cpp: Added.
+        * loader/CachedResourceClientWalker.h: Added.
+
+        * bridge/mac/FrameMac.mm:
+        * bridge/mac/WebCoreFrameBridge.mm:
+        * css/CSSImageValue.h:
+        * css/CSSImportRule.h:
+        * dom/Document.cpp:
+        * dom/Document.h:
+        * dom/Notation.h:
+        * dom/ProcessingInstruction.h:
+        * dom/XMLTokenizer.cpp:
+        * html/CanvasPattern.h:
+        * html/HTMLDocument.h:
+        * html/HTMLImageLoader.cpp:
+        * html/HTMLImageLoader.h:
+        * html/HTMLLinkElement.h:
+        * html/HTMLScriptElement.cpp:
+        * html/HTMLScriptElement.h:
+        * html/HTMLTokenizer.cpp:
+        * html/HTMLTokenizer.h:
+        * kcanvas/KCanvasFilters.h:
+        * ksvg2/svg/SVGCursorElement.cpp:
+        * ksvg2/svg/SVGCursorElement.h:
+        * ksvg2/svg/SVGFEImageElement.cpp:
+        * ksvg2/svg/SVGFEImageElement.h:
+        * loader/Cache.cpp:
+        * loader/Cache.h:
+        * loader/CachedCSSStyleSheet.cpp:
+        * loader/CachedCSSStyleSheet.h:
+        * loader/CachedImage.cpp:
+        * loader/CachedImage.h:
+        * loader/CachedScript.cpp:
+        * loader/CachedScript.h:
+        * loader/CachedXBLDocument.cpp:
+        * loader/CachedXBLDocument.h:
+        * loader/CachedXSLStyleSheet.cpp:
+        * loader/CachedXSLStyleSheet.h:
+        * loader/DocLoader.cpp:
+        * loader/DocLoader.h:
+        * loader/LoaderFunctions.h:
+        * loader/Request.cpp:
+        * loader/Request.h:
+        * loader/loader.cpp:
+        * loader/loader.h:
+        * loader/mac/LoaderFunctionsMac.mm:
+        * page/Frame.cpp:
+        * page/FrameView.cpp:
+        * platform/gdk/TemporaryLinkStubs.cpp:
+        * platform/mac/ClipboardMac.h:
+        * platform/win/TemporaryLinkStubs.cpp:
+        * rendering/RenderBox.h:
+        * rendering/RenderContainer.cpp:
+        * rendering/RenderImage.cpp:
+        * rendering/RenderImage.h:
+        * rendering/RenderLayer.h:
+        * rendering/RenderObject.cpp:
+        * rendering/RenderObject.h:
+        * rendering/RenderStyle.cpp:
+        * rendering/RenderStyle.h:
+        * xml/XSLImportRule.h:
+        Did renaming.
+
+        * platform/mac/can-convert.mm: Removed.
+
 2006-07-09  Anders Carlsson  <acarlsson@apple.com>
 
         Reviewed by Tim O.
index 3ee2175331657da67b90aa1ac991096f9270938b..6dee393ac99382dc6c64db793f4deb14ff91a928 100644 (file)
@@ -44,7 +44,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..&quot;;&quot;$(ProjectDir)\..\..\dom&quot;;&quot;$(ProjectDir)\..\..\bridge\win&quot;;&quot;$(ProjectDir)\..\..\bridge&quot;;&quot;$(ProjectDir)\..\..\editing&quot;;&quot;$(ProjectDir)\..\..\page&quot;;&quot;$(ProjectDir)\..\..\loader&quot;;&quot;$(ProjectDir)\..\..\khtml&quot;;&quot;$(ProjectDir)\..\..\khtml\misc&quot;;&quot;$(ProjectDir)\..\..\khtml\html&quot;;&quot;$(ProjectDir)\..\..\..\icu\include&quot;;&quot;$(ProjectDir)\..\..\icu&quot;;&quot;$(ProjectDir)\..\..\kwq&quot;;&quot;$(ProjectDir)\..\..\platform\win&quot;;&quot;$(ProjectDir)\..\..\platform&quot;;&quot;$(ProjectDir)\..\..\platform\cairo\cairo\src&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore\os-win32&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore&quot;;&quot;$(ProjectDir)\..\..\ForwardingHeaders&quot;;&quot;$(ProjectDir)\..\..\rendering&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..&quot;;&quot;$(ProjectDir)\..\..\dom&quot;;&quot;$(ProjectDir)\..\..\bridge\win&quot;;&quot;$(ProjectDir)\..\..\bridge&quot;;&quot;$(ProjectDir)\..\..\editing&quot;;&quot;$(ProjectDir)\..\..\page&quot;;&quot;$(ProjectDir)\..\..\loader&quot;;&quot;$(ProjectDir)\..\..\..\icu\include&quot;;&quot;$(ProjectDir)\..\..\icu&quot;;&quot;$(ProjectDir)\..\..\platform\win&quot;;&quot;$(ProjectDir)\..\..\platform&quot;;&quot;$(ProjectDir)\..\..\platform\cairo\cairo\src&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore\os-win32&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore&quot;;&quot;$(ProjectDir)\..\..\ForwardingHeaders&quot;;&quot;$(ProjectDir)\..\..\rendering&quot;"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..&quot;;&quot;$(ProjectDir)\..\..\dom&quot;;&quot;$(ProjectDir)\..\..\bridge\win&quot;;&quot;$(ProjectDir)\..\..\bridge&quot;;&quot;$(ProjectDir)\..\..\editing&quot;;&quot;$(ProjectDir)\..\..\page&quot;;&quot;$(ProjectDir)\..\..\loader&quot;;&quot;$(ProjectDir)\..\..\khtml&quot;;&quot;$(ProjectDir)\..\..\khtml\misc&quot;;&quot;$(ProjectDir)\..\..\khtml\html&quot;;&quot;$(ProjectDir)\..\..\..\icu\include&quot;;&quot;$(ProjectDir)\..\..\icu&quot;;&quot;$(ProjectDir)\..\..\kwq&quot;;&quot;$(ProjectDir)\..\..\platform\win&quot;;&quot;$(ProjectDir)\..\..\platform&quot;;&quot;$(ProjectDir)\..\..\platform\cairo\cairo\src&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore\os-win32&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore&quot;;&quot;$(ProjectDir)\..\..\ForwardingHeaders&quot;;&quot;$(ProjectDir)\..\..\rendering&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..&quot;;&quot;$(ProjectDir)\..\..\dom&quot;;&quot;$(ProjectDir)\..\..\bridge\win&quot;;&quot;$(ProjectDir)\..\..\bridge&quot;;&quot;$(ProjectDir)\..\..\editing&quot;;&quot;$(ProjectDir)\..\..\page&quot;;&quot;$(ProjectDir)\..\..\loader&quot;;&quot;$(ProjectDir)\..\..\..\icu\include&quot;;&quot;$(ProjectDir)\..\..\icu&quot;;&quot;$(ProjectDir)\..\..\platform\win&quot;;&quot;$(ProjectDir)\..\..\platform&quot;;&quot;$(ProjectDir)\..\..\platform\cairo\cairo\src&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore\os-win32&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore&quot;;&quot;$(ProjectDir)\..\..\ForwardingHeaders&quot;;&quot;$(ProjectDir)\..\..\rendering&quot;"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG"\r
                                MinimalRebuild="false"\r
                                RuntimeLibrary="2"\r
index a1dea58eb27ea9e80d707a819fd8821440135914..e6f6da132b60c329c0b41c8b0757a5c7327a26bf 100644 (file)
@@ -41,7 +41,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\..\iconv\include&quot;;&quot;$(ProjectDir)\..\..\..\icu\include&quot;;&quot;$(ProjectDir)\..\..\..\libxml\include&quot;;&quot;$(ProjectDir)\..\..\..\libxslt\include&quot;;&quot;$(ProjectDir)\..\..\DerivedSources\WebCore&quot;;&quot;$(ProjectDir)\..\..\&quot;;&quot;$(ProjectDir)\..\..\css&quot;;&quot;$(ProjectDir)\..\..\khtml\dom&quot;;&quot;$(ProjectDir)\..\..\editing&quot;;&quot;$(ProjectDir)\..\..\khtml\misc&quot;;&quot;$(ProjectDir)\..\..\rendering&quot;;&quot;$(ProjectDir)\..\..\bindings\js&quot;;&quot;$(ProjectDir)\..\..\dom&quot;;&quot;$(ProjectDir)\..\..\html&quot;;&quot;$(ProjectDir)\..\..\kwq&quot;;&quot;$(ProjectDir)\..\..\bridge&quot;;&quot;$(ProjectDir)\..\..\bridge\win&quot;;&quot;$(ProjectDir)\..\..\loader&quot;;&quot;$(ProjectDir)\..\..\page&quot;;&quot;$(ProjectDir)\..\..\platform&quot;;&quot;$(ProjectDir)\..\..\platform\cairo&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\bmp&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\gif&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\ico&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\jpeg&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\png&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\xbm&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\zlib&quot;;&quot;$(ProjectDir)\..\..\xml&quot;;&quot;$(ProjectDir)\..\..\xpath&quot;;&quot;$(ProjectDir)\..\..\xpath\impl&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore\os-win32&quot;;&quot;$(ProjectDir)\..\..\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\WebCore.intermediate\$(ConfigurationName)\WebCore.intermediate\DerivedSources&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore\kjs&quot;;&quot;$(ProjectDir)\..\..\platform\win&quot;;&quot;$(ProjectDir)\..\..\platform\cairo\pixman\src&quot;;&quot;$(ProjectDir)\..\..\platform\cairo\cairo\src&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\..\iconv\include&quot;;&quot;$(ProjectDir)\..\..\..\icu\include&quot;;&quot;$(ProjectDir)\..\..\..\libxml\include&quot;;&quot;$(ProjectDir)\..\..\..\libxslt\include&quot;;&quot;$(ProjectDir)\..\..\DerivedSources\WebCore&quot;;&quot;$(ProjectDir)\..\..\&quot;;&quot;$(ProjectDir)\..\..\css&quot;;&quot;$(ProjectDir)\..\..\editing&quot;;&quot;$(ProjectDir)\..\..\rendering&quot;;&quot;$(ProjectDir)\..\..\bindings\js&quot;;&quot;$(ProjectDir)\..\..\dom&quot;;&quot;$(ProjectDir)\..\..\html&quot;;&quot;$(ProjectDir)\..\..\bridge&quot;;&quot;$(ProjectDir)\..\..\bridge\win&quot;;&quot;$(ProjectDir)\..\..\loader&quot;;&quot;$(ProjectDir)\..\..\page&quot;;&quot;$(ProjectDir)\..\..\platform&quot;;&quot;$(ProjectDir)\..\..\platform\cairo&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\bmp&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\gif&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\ico&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\jpeg&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\png&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\xbm&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\zlib&quot;;&quot;$(ProjectDir)\..\..\xml&quot;;&quot;$(ProjectDir)\..\..\xpath&quot;;&quot;$(ProjectDir)\..\..\xpath\impl&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore\os-win32&quot;;&quot;$(ProjectDir)\..\..\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\WebCore.intermediate\$(ConfigurationName)\WebCore.intermediate\DerivedSources&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore\kjs&quot;;&quot;$(ProjectDir)\..\..\platform\win&quot;;&quot;$(ProjectDir)\..\..\platform\cairo\pixman\src&quot;;&quot;$(ProjectDir)\..\..\platform\cairo\cairo\src&quot;"\r
                                PreprocessorDefinitions="WIN32;KHTML_NO_XBL;KHTML_XSLT;XPATH_SUPPORT"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="0"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\..\iconv\include&quot;;&quot;$(ProjectDir)\..\..\..\icu\include&quot;;&quot;$(ProjectDir)\..\..\..\libxml\include&quot;;&quot;$(ProjectDir)\..\..\..\libxslt\include&quot;;&quot;$(ProjectDir)\..\..\DerivedSources\WebCore&quot;;&quot;$(ProjectDir)\..\..\&quot;;&quot;$(ProjectDir)\..\..\css&quot;;&quot;$(ProjectDir)\..\..\khtml\dom&quot;;&quot;$(ProjectDir)\..\..\editing&quot;;&quot;$(ProjectDir)\..\..\khtml\misc&quot;;&quot;$(ProjectDir)\..\..\rendering&quot;;&quot;$(ProjectDir)\..\..\bindings\js&quot;;&quot;$(ProjectDir)\..\..\dom&quot;;&quot;$(ProjectDir)\..\..\html&quot;;&quot;$(ProjectDir)\..\..\kwq&quot;;&quot;$(ProjectDir)\..\..\bridge&quot;;&quot;$(ProjectDir)\..\..\bridge\win&quot;;&quot;$(ProjectDir)\..\..\loader&quot;;&quot;$(ProjectDir)\..\..\page&quot;;&quot;$(ProjectDir)\..\..\platform&quot;;&quot;$(ProjectDir)\..\..\platform\cairo&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\bmp&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\gif&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\ico&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\jpeg&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\png&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\xbm&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\zlib&quot;;&quot;$(ProjectDir)\..\..\xml&quot;;&quot;$(ProjectDir)\..\..\xpath&quot;;&quot;$(ProjectDir)\..\..\xpath\impl&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore\os-win32&quot;;&quot;$(ProjectDir)\..\..\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\WebCore.intermediate\$(ConfigurationName)\WebCore.intermediate\DerivedSources&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore\kjs&quot;;&quot;$(ProjectDir)\..\..\platform\win&quot;;&quot;$(ProjectDir)\..\..\platform\cairo\pixman\src&quot;;&quot;$(ProjectDir)\..\..\platform\cairo\cairo\src&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\..\iconv\include&quot;;&quot;$(ProjectDir)\..\..\..\icu\include&quot;;&quot;$(ProjectDir)\..\..\..\libxml\include&quot;;&quot;$(ProjectDir)\..\..\..\libxslt\include&quot;;&quot;$(ProjectDir)\..\..\DerivedSources\WebCore&quot;;&quot;$(ProjectDir)\..\..\&quot;;&quot;$(ProjectDir)\..\..\css&quot;;&quot;$(ProjectDir)\..\..\editing&quot;;&quot;$(ProjectDir)\..\..\rendering&quot;;&quot;$(ProjectDir)\..\..\bindings\js&quot;;&quot;$(ProjectDir)\..\..\dom&quot;;&quot;$(ProjectDir)\..\..\html&quot;;&quot;$(ProjectDir)\..\..\bridge&quot;;&quot;$(ProjectDir)\..\..\bridge\win&quot;;&quot;$(ProjectDir)\..\..\loader&quot;;&quot;$(ProjectDir)\..\..\page&quot;;&quot;$(ProjectDir)\..\..\platform&quot;;&quot;$(ProjectDir)\..\..\platform\cairo&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\bmp&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\gif&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\ico&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\jpeg&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\png&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\xbm&quot;;&quot;$(ProjectDir)\..\..\platform\image-decoders\zlib&quot;;&quot;$(ProjectDir)\..\..\xml&quot;;&quot;$(ProjectDir)\..\..\xpath&quot;;&quot;$(ProjectDir)\..\..\xpath\impl&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore\os-win32&quot;;&quot;$(ProjectDir)\..\..\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\WebCore.intermediate\$(ConfigurationName)\WebCore.intermediate\DerivedSources&quot;;&quot;$(ProjectDir)\..\..\..\JavaScriptCore\kjs&quot;;&quot;$(ProjectDir)\..\..\platform\win&quot;;&quot;$(ProjectDir)\..\..\platform\cairo\pixman\src&quot;;&quot;$(ProjectDir)\..\..\platform\cairo\cairo\src&quot;"\r
                                PreprocessorDefinitions="WIN32;KHTML_NO_XBL;KHTML_XSLT;XPATH_SUPPORT;NDEBUG"\r
                                ExceptionHandling="0"\r
                                RuntimeLibrary="2"\r
        <References>\r
        </References>\r
        <Files>\r
-               <Filter\r
-                       Name="kwq"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\..\kwq\AccessibilityObjectCache.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\page\Settings.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\loader\LoaderFunctions.h"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
                <Filter\r
                        Name="DerivedSources"\r
                        >\r
                                >\r
                        </File>\r
                </Filter>\r
-               <Filter\r
-                       Name="khtml"\r
-                       >\r
-                       <Filter\r
-                               Name="misc"\r
-                               >\r
-                       </Filter>\r
-               </Filter>\r
                <Filter\r
                        Name="page"\r
                        >\r
                                RelativePath="..\..\page\Plugin.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\page\Settings.h"\r
+                               >\r
+                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="loader"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\loader\CachedObject.cpp"\r
+                               RelativePath="..\..\loader\CachedResource.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\loader\CachedObject.h"\r
+                               RelativePath="..\..\loader\CachedResource.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\loader\CachedObjectClient.h"\r
+                               RelativePath="..\..\loader\CachedResourceClient.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\loader\CachedObjectClientWalker.cpp"\r
+                               RelativePath="..\..\loader\CachedResourceClientWalker.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\loader\CachedObjectClientWalker.h"\r
+                               RelativePath="..\..\loader\CachedResourceClientWalker.h"\r
                                >\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\loader\loader.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\loader\LoaderFunctions.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\loader\PluginDocument.cpp"\r
                                >\r
                <Filter\r
                        Name="bridge"\r
                        >\r
+                       <File\r
+                               RelativePath="..\..\bridge\AXObjectCache.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\bridge\BrowserExtension.h"\r
                                >\r
index ffdc4a4a4ea3f1018764e55fd79bdc5b468230a4..35e71a50b1446daa22ea686bb24000663c528cc5 100644 (file)
                93F199B808245E59001E9ABC /* ScrollBar.h in Headers */ = {isa = PBXBuildFile; fileRef = BC7B2AF80450824100A8000F /* ScrollBar.h */; };
                93F199BB08245E59001E9ABC /* WebCoreKeyboardAccess.h in Headers */ = {isa = PBXBuildFile; fileRef = BE983D95052A2E0A00892D85 /* WebCoreKeyboardAccess.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F199BC08245E59001E9ABC /* WebCoreAXObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 55998A5A052B59CC0017A6C1 /* WebCoreAXObject.h */; };
-               93F199BD08245E59001E9ABC /* AccessibilityObjectCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 55998A5C052B59CC0017A6C1 /* AccessibilityObjectCache.h */; };
+               93F199BD08245E59001E9ABC /* AXObjectCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 55998A5C052B59CC0017A6C1 /* AXObjectCache.h */; };
                93F199BE08245E59001E9ABC /* BlockExceptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 65A640F00533BB1F0085E777 /* BlockExceptions.h */; settings = {ATTRIBUTES = (); }; };
                93F199C208245E59001E9ABC /* WebCoreKeyGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 84B2B1F7056BEF3A00D2B771 /* WebCoreKeyGenerator.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F199CF08245E59001E9ABC /* AtomicStringList.h in Headers */ = {isa = PBXBuildFile; fileRef = BC3B364705C9D5E200E42902 /* AtomicStringList.h */; };
                93F19AD508245E59001E9ABC /* RenderTreeAsText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93955A4203D72932008635CE /* RenderTreeAsText.cpp */; };
                93F19ADC08245E59001E9ABC /* ScrollBarMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC7B2AF90450824100A8000F /* ScrollBarMac.mm */; };
                93F19ADF08245E59001E9ABC /* WebCoreAXObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 55998A5B052B59CC0017A6C1 /* WebCoreAXObject.mm */; };
-               93F19AE008245E59001E9ABC /* AccessibilityObjectCache.mm in Sources */ = {isa = PBXBuildFile; fileRef = 55998A5D052B59CC0017A6C1 /* AccessibilityObjectCache.mm */; };
+               93F19AE008245E59001E9ABC /* AXObjectCacheMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 55998A5D052B59CC0017A6C1 /* AXObjectCacheMac.mm */; };
                93F19AE108245E59001E9ABC /* BlockExceptions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 65F80697054D9F86008BF776 /* BlockExceptions.mm */; };
                93F19AE508245E59001E9ABC /* WebCoreKeyGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = 84B2B1F8056BEF3A00D2B771 /* WebCoreKeyGenerator.m */; };
                93F19AE608245E59001E9ABC /* SSLKeyGeneratorMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84B2B24F056BF15F00D2B771 /* SSLKeyGeneratorMac.mm */; };
                BCB16C1A0979C3BD00467741 /* CachedCSSStyleSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB16C010979C3BD00467741 /* CachedCSSStyleSheet.h */; };
                BCB16C1B0979C3BD00467741 /* CachedImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB16C020979C3BD00467741 /* CachedImage.cpp */; };
                BCB16C1C0979C3BD00467741 /* CachedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB16C030979C3BD00467741 /* CachedImage.h */; };
-               BCB16C1F0979C3BD00467741 /* CachedObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB16C060979C3BD00467741 /* CachedObject.cpp */; };
-               BCB16C200979C3BD00467741 /* CachedObject.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB16C070979C3BD00467741 /* CachedObject.h */; };
-               BCB16C210979C3BD00467741 /* CachedObjectClientWalker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB16C080979C3BD00467741 /* CachedObjectClientWalker.cpp */; };
-               BCB16C220979C3BD00467741 /* CachedObjectClientWalker.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB16C090979C3BD00467741 /* CachedObjectClientWalker.h */; };
+               BCB16C1F0979C3BD00467741 /* CachedResource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB16C060979C3BD00467741 /* CachedResource.cpp */; };
+               BCB16C200979C3BD00467741 /* CachedResource.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB16C070979C3BD00467741 /* CachedResource.h */; };
+               BCB16C210979C3BD00467741 /* CachedResourceClientWalker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB16C080979C3BD00467741 /* CachedResourceClientWalker.cpp */; };
+               BCB16C220979C3BD00467741 /* CachedResourceClientWalker.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB16C090979C3BD00467741 /* CachedResourceClientWalker.h */; };
                BCB16C230979C3BD00467741 /* CachedScript.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB16C0A0979C3BD00467741 /* CachedScript.cpp */; };
                BCB16C240979C3BD00467741 /* CachedScript.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB16C0B0979C3BD00467741 /* CachedScript.h */; };
                BCB16C250979C3BD00467741 /* CachedXBLDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB16C0C0979C3BD00467741 /* CachedXBLDocument.cpp */; };
                BCF7C0990A1683580032F75B /* FontFallbackListMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCF7C0980A1683580032F75B /* FontFallbackListMac.mm */; };
                BCF7C0B80A1687CC0032F75B /* FontCache.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF7C0B70A1687CC0032F75B /* FontCache.h */; };
                BCF7C2340A16B5F80032F75B /* FontCacheMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCF7C2330A16B5F80032F75B /* FontCacheMac.mm */; };
-               BCFB2E5E0979E46400BA703D /* CachedObjectClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCFB2E5D0979E46400BA703D /* CachedObjectClient.h */; };
+               BCFB2E5E0979E46400BA703D /* CachedResourceClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCFB2E5D0979E46400BA703D /* CachedResourceClient.h */; };
                BCFB2E840979FD4F00BA703D /* Shared.h in Headers */ = {isa = PBXBuildFile; fileRef = BCFB2E830979FD4F00BA703D /* Shared.h */; };
                BCFB2F41097A24B500BA703D /* SegmentedString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCFB2F3F097A24B500BA703D /* SegmentedString.cpp */; };
                BCFB2F42097A24B500BA703D /* SegmentedString.h in Headers */ = {isa = PBXBuildFile; fileRef = BCFB2F40097A24B500BA703D /* SegmentedString.h */; };
                550A0BC8085F6039007353D6 /* QualifiedName.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = QualifiedName.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                55998A5A052B59CC0017A6C1 /* WebCoreAXObject.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreAXObject.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                55998A5B052B59CC0017A6C1 /* WebCoreAXObject.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreAXObject.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               55998A5C052B59CC0017A6C1 /* AccessibilityObjectCache.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityObjectCache.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               55998A5D052B59CC0017A6C1 /* AccessibilityObjectCache.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AccessibilityObjectCache.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               55998A5C052B59CC0017A6C1 /* AXObjectCache.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = AXObjectCache.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               55998A5D052B59CC0017A6C1 /* AXObjectCacheMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AXObjectCacheMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                650F53DB09D15DDA00C9B0C8 /* CSSGrammar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSGrammar.h; sourceTree = "<group>"; };
                651B4D8309AC83370029F1EF /* DeprecatedStringList.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedStringList.cpp; sourceTree = "<group>"; };
                651B4D8409AC83370029F1EF /* DeprecatedStringList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DeprecatedStringList.h; sourceTree = "<group>"; };
                BCB16C010979C3BD00467741 /* CachedCSSStyleSheet.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CachedCSSStyleSheet.h; sourceTree = "<group>"; };
                BCB16C020979C3BD00467741 /* CachedImage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CachedImage.cpp; sourceTree = "<group>"; };
                BCB16C030979C3BD00467741 /* CachedImage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CachedImage.h; sourceTree = "<group>"; };
-               BCB16C060979C3BD00467741 /* CachedObject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CachedObject.cpp; sourceTree = "<group>"; };
-               BCB16C070979C3BD00467741 /* CachedObject.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CachedObject.h; sourceTree = "<group>"; };
-               BCB16C080979C3BD00467741 /* CachedObjectClientWalker.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CachedObjectClientWalker.cpp; sourceTree = "<group>"; };
-               BCB16C090979C3BD00467741 /* CachedObjectClientWalker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CachedObjectClientWalker.h; sourceTree = "<group>"; };
+               BCB16C060979C3BD00467741 /* CachedResource.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CachedResource.cpp; sourceTree = "<group>"; };
+               BCB16C070979C3BD00467741 /* CachedResource.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CachedResource.h; sourceTree = "<group>"; };
+               BCB16C080979C3BD00467741 /* CachedResourceClientWalker.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CachedResourceClientWalker.cpp; sourceTree = "<group>"; };
+               BCB16C090979C3BD00467741 /* CachedResourceClientWalker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CachedResourceClientWalker.h; sourceTree = "<group>"; };
                BCB16C0A0979C3BD00467741 /* CachedScript.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CachedScript.cpp; sourceTree = "<group>"; };
                BCB16C0B0979C3BD00467741 /* CachedScript.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CachedScript.h; sourceTree = "<group>"; };
                BCB16C0C0979C3BD00467741 /* CachedXBLDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CachedXBLDocument.cpp; sourceTree = "<group>"; };
                BCF7C0980A1683580032F75B /* FontFallbackListMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = FontFallbackListMac.mm; sourceTree = "<group>"; };
                BCF7C0B70A1687CC0032F75B /* FontCache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FontCache.h; sourceTree = "<group>"; };
                BCF7C2330A16B5F80032F75B /* FontCacheMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = FontCacheMac.mm; sourceTree = "<group>"; };
-               BCFB2E5D0979E46400BA703D /* CachedObjectClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CachedObjectClient.h; sourceTree = "<group>"; };
+               BCFB2E5D0979E46400BA703D /* CachedResourceClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CachedResourceClient.h; sourceTree = "<group>"; };
                BCFB2E830979FD4F00BA703D /* Shared.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Shared.h; sourceTree = "<group>"; };
                BCFB2F3F097A24B500BA703D /* SegmentedString.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentedString.cpp; sourceTree = "<group>"; };
                BCFB2F40097A24B500BA703D /* SegmentedString.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SegmentedString.h; sourceTree = "<group>"; };
                                5126E6B60A2E3AEF005C29FA /* icon */,
                                A8C0FB51089701F700BA5114 /* kcanvas */,
                                A8C0F6E9089701F100BA5114 /* ksvg2 */,
-                               F58785E802DE377601EA4122 /* kwq */,
                                BCB16BFB0979C38700467741 /* loader */,
                                65BF02180974806300C43196 /* page */,
                                BCF1A5BA097832090061A123 /* platform */,
                        isa = PBXGroup;
                        children = (
                                65BF02350974819000C43196 /* mac */,
+                               55998A5C052B59CC0017A6C1 /* AXObjectCache.h */,
                                BCEA4943097F0F5C0094C9E4 /* BrowserExtension.h */,
                                935C475C09AC4CA000A6AAB4 /* History.h */,
                                F587864502DE3A7701EA4122 /* JavaAppletWidget.h */,
                65BF02350974819000C43196 /* mac */ = {
                        isa = PBXGroup;
                        children = (
-                               65901A4209FC6039005BD752 /* WebCoreStringTruncator.h */,
-                               65901A4309FC6039005BD752 /* WebCoreStringTruncator.mm */,
+                               55998A5D052B59CC0017A6C1 /* AXObjectCacheMac.mm */,
                                BCEA4945097F0F770094C9E4 /* BrowserExtensionMac.h */,
                                BCEA4946097F0F770094C9E4 /* BrowserExtensionMac.mm */,
+                               93B641F206E28C5C0055F610 /* FormDataMac.h */,
+                               93B641F106E28C5C0055F610 /* FormDataMac.mm */,
                                65BF023B0974819000C43196 /* FrameMac.h */,
                                65BF023C0974819000C43196 /* FrameMac.mm */,
                                9380F68609A143B2001FDB34 /* FrameViewMac.mm */,
                                93E47C5B09BE2BBB0019C5C1 /* PageMac.mm */,
                                F5B2A4FC02E2220F018635CB /* WebCoreCache.h */,
                                F5B2A4FD02E2220F018635CB /* WebCoreCache.mm */,
+                               BEF7EEA005FF8F0D009717EE /* WebCoreEditCommand.h */,
+                               BEF7EEA105FF8F0D009717EE /* WebCoreEditCommand.mm */,
                                F56234DF03026D7301629B47 /* WebCoreEncodings.h */,
                                F56234E003026D7301629B47 /* WebCoreEncodings.mm */,
                                654EC60F097778F500DAB52C /* WebCoreFrameBridge.h */,
                                BE983D95052A2E0A00892D85 /* WebCoreKeyboardAccess.h */,
                                65C7F4310979E2620022E453 /* WebCorePageBridge.h */,
                                65C7F44B0979E8C90022E453 /* WebCorePageBridge.mm */,
+                               9394E0A403AA5BBE008635CE /* WebCorePageState.h */,
+                               9394E0A503AA5BBE008635CE /* WebCorePageState.mm */,
                                F587855002DE375901EA4122 /* WebCoreResourceLoader.h */,
+                               93386B90037045B3008635CE /* WebCoreResourceLoaderImp.h */,
+                               93386B91037045B3008635CE /* WebCoreResourceLoaderImp.mm */,
                                7E6FEED60898582300C44C3F /* WebCoreScriptDebugger.h */,
                                7E6FEED70898582300C44C3F /* WebCoreScriptDebugger.mm */,
                                F565AE8502ECA583018635CA /* WebCoreSettings.h */,
                                F565AE8602ECA583018635CA /* WebCoreSettings.mm */,
+                               65901A4209FC6039005BD752 /* WebCoreStringTruncator.h */,
+                               65901A4309FC6039005BD752 /* WebCoreStringTruncator.mm */,
                                E1EE773508F1086C00166870 /* WebCoreTextDecoder.h */,
                                E1EE773608F1086C00166870 /* WebCoreTextDecoder.mm */,
                                F587855402DE375901EA4122 /* WebCoreViewFactory.h */,
                                F587855502DE375901EA4122 /* WebCoreViewFactory.m */,
                                5150C2A10702629000AF642C /* WebDashboardRegion.h */,
                                5150C2A50702629800AF642C /* WebDashboardRegion.m */,
+                               55998A5A052B59CC0017A6C1 /* WebCoreAXObject.h */,
+                               55998A5B052B59CC0017A6C1 /* WebCoreAXObject.mm */,
                        );
                        path = mac;
                        sourceTree = "<group>";
                                BCB16C010979C3BD00467741 /* CachedCSSStyleSheet.h */,
                                BCB16C020979C3BD00467741 /* CachedImage.cpp */,
                                BCB16C030979C3BD00467741 /* CachedImage.h */,
-                               BCB16C060979C3BD00467741 /* CachedObject.cpp */,
-                               BCB16C070979C3BD00467741 /* CachedObject.h */,
-                               BCFB2E5D0979E46400BA703D /* CachedObjectClient.h */,
-                               BCB16C080979C3BD00467741 /* CachedObjectClientWalker.cpp */,
-                               BCB16C090979C3BD00467741 /* CachedObjectClientWalker.h */,
+                               BCB16C060979C3BD00467741 /* CachedResource.cpp */,
+                               BCB16C070979C3BD00467741 /* CachedResource.h */,
+                               BCFB2E5D0979E46400BA703D /* CachedResourceClient.h */,
+                               BCB16C080979C3BD00467741 /* CachedResourceClientWalker.cpp */,
+                               BCB16C090979C3BD00467741 /* CachedResourceClientWalker.h */,
                                BCB16C0A0979C3BD00467741 /* CachedScript.cpp */,
                                BCB16C0B0979C3BD00467741 /* CachedScript.h */,
                                BCB16C0C0979C3BD00467741 /* CachedXBLDocument.cpp */,
                        path = dom;
                        sourceTree = "<group>";
                };
-               F58785E802DE377601EA4122 /* kwq */ = {
-                       isa = PBXGroup;
-                       children = (
-                               55998A5C052B59CC0017A6C1 /* AccessibilityObjectCache.h */,
-                               55998A5D052B59CC0017A6C1 /* AccessibilityObjectCache.mm */,
-                               93B641F206E28C5C0055F610 /* FormDataMac.h */,
-                               93B641F106E28C5C0055F610 /* FormDataMac.mm */,
-                               55998A5A052B59CC0017A6C1 /* WebCoreAXObject.h */,
-                               55998A5B052B59CC0017A6C1 /* WebCoreAXObject.mm */,
-                               BEF7EEA005FF8F0D009717EE /* WebCoreEditCommand.h */,
-                               BEF7EEA105FF8F0D009717EE /* WebCoreEditCommand.mm */,
-                               9394E0A403AA5BBE008635CE /* WebCorePageState.h */,
-                               9394E0A503AA5BBE008635CE /* WebCorePageState.mm */,
-                               93386B90037045B3008635CE /* WebCoreResourceLoaderImp.h */,
-                               93386B91037045B3008635CE /* WebCoreResourceLoaderImp.mm */,
-                       );
-                       path = kwq;
-                       sourceTree = "<group>";
-               };
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
                                93F199B808245E59001E9ABC /* ScrollBar.h in Headers */,
                                93F199BB08245E59001E9ABC /* WebCoreKeyboardAccess.h in Headers */,
                                93F199BC08245E59001E9ABC /* WebCoreAXObject.h in Headers */,
-                               93F199BD08245E59001E9ABC /* AccessibilityObjectCache.h in Headers */,
+                               93F199BD08245E59001E9ABC /* AXObjectCache.h in Headers */,
                                93F199BE08245E59001E9ABC /* BlockExceptions.h in Headers */,
                                93F199C208245E59001E9ABC /* WebCoreKeyGenerator.h in Headers */,
                                93F199CF08245E59001E9ABC /* AtomicStringList.h in Headers */,
                                BCB16C180979C3BD00467741 /* Cache.h in Headers */,
                                BCB16C1A0979C3BD00467741 /* CachedCSSStyleSheet.h in Headers */,
                                BCB16C1C0979C3BD00467741 /* CachedImage.h in Headers */,
-                               BCB16C200979C3BD00467741 /* CachedObject.h in Headers */,
-                               BCB16C220979C3BD00467741 /* CachedObjectClientWalker.h in Headers */,
+                               BCB16C200979C3BD00467741 /* CachedResource.h in Headers */,
+                               BCB16C220979C3BD00467741 /* CachedResourceClientWalker.h in Headers */,
                                BCB16C240979C3BD00467741 /* CachedScript.h in Headers */,
                                BCB16C260979C3BD00467741 /* CachedXBLDocument.h in Headers */,
                                BCB16C280979C3BD00467741 /* CachedXSLStyleSheet.h in Headers */,
                                BCB16C2A0979C3BD00467741 /* DocLoader.h in Headers */,
                                BCB16C2D0979C3BD00467741 /* loader.h in Headers */,
                                BCB16C2F0979C3BD00467741 /* Request.h in Headers */,
-                               BCFB2E5E0979E46400BA703D /* CachedObjectClient.h in Headers */,
+                               BCFB2E5E0979E46400BA703D /* CachedResourceClient.h in Headers */,
                                A8FEFB0A0979F472005839FD /* RenderForeignObject.h in Headers */,
                                A8FEFB320979F4F6005839FD /* SVGForeignObjectElement.h in Headers */,
                                BCFB2E840979FD4F00BA703D /* Shared.h in Headers */,
                                93F19AD508245E59001E9ABC /* RenderTreeAsText.cpp in Sources */,
                                93F19ADC08245E59001E9ABC /* ScrollBarMac.mm in Sources */,
                                93F19ADF08245E59001E9ABC /* WebCoreAXObject.mm in Sources */,
-                               93F19AE008245E59001E9ABC /* AccessibilityObjectCache.mm in Sources */,
+                               93F19AE008245E59001E9ABC /* AXObjectCacheMac.mm in Sources */,
                                93F19AE108245E59001E9ABC /* BlockExceptions.mm in Sources */,
                                93F19AE508245E59001E9ABC /* WebCoreKeyGenerator.m in Sources */,
                                93F19AE608245E59001E9ABC /* SSLKeyGeneratorMac.mm in Sources */,
                                BCB16C170979C3BD00467741 /* Cache.cpp in Sources */,
                                BCB16C190979C3BD00467741 /* CachedCSSStyleSheet.cpp in Sources */,
                                BCB16C1B0979C3BD00467741 /* CachedImage.cpp in Sources */,
-                               BCB16C1F0979C3BD00467741 /* CachedObject.cpp in Sources */,
-                               BCB16C210979C3BD00467741 /* CachedObjectClientWalker.cpp in Sources */,
+                               BCB16C1F0979C3BD00467741 /* CachedResource.cpp in Sources */,
+                               BCB16C210979C3BD00467741 /* CachedResourceClientWalker.cpp in Sources */,
                                BCB16C230979C3BD00467741 /* CachedScript.cpp in Sources */,
                                BCB16C250979C3BD00467741 /* CachedXBLDocument.cpp in Sources */,
                                BCB16C270979C3BD00467741 /* CachedXSLStyleSheet.cpp in Sources */,
index 78c9cbc8481829718a332d7de9132ff7b4ff4838..9b4d8800a911e652d90117561c60fa4428693b82 100644 (file)
                loader/Cache.cpp
                loader/CachedCSSStyleSheet.cpp
                loader/CachedImage.cpp
-               loader/CachedObject.cpp
-               loader/CachedObjectClientWalker.cpp
+               loader/CachedResource.cpp
+               loader/CachedResourceClientWalker.cpp
                loader/CachedScript.cpp
                loader/CachedXSLStyleSheet.cpp
                loader/Decoder.cpp
similarity index 77%
rename from WebCore/kwq/AccessibilityObjectCache.h
rename to WebCore/bridge/AXObjectCache.h
index 45c3f38f5684db72775454549316fb93d70ad04c..a9b2786b920b0d2de072fbf6f45c51745f53eea8 100644 (file)
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef AccessibilityObjectCache_h
-#define AccessibilityObjectCache_h
+#ifndef AXObjectCache_h
+#define AXObjectCache_h
 
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
@@ -49,9 +49,9 @@ namespace WebCore {
         static TraitType deletedValue() { return UINT_MAX; }
     };
 
-    class AccessibilityObjectCache {
+    class AXObjectCache {
     public:
-        ~AccessibilityObjectCache();
+        ~AXObjectCache();
 
         WebCoreAXObject* get(RenderObject*);
         void remove(RenderObject*);
@@ -79,14 +79,14 @@ namespace WebCore {
     };
 
 #ifndef __APPLE__
-    inline AccessibilityObjectCache::~AccessibilityObjectCache() { }
-    inline WebCoreAXObject* AccessibilityObjectCache::get(RenderObject*) { return 0; }
-    inline void AccessibilityObjectCache::remove(RenderObject*) { }
-    inline void AccessibilityObjectCache::removeAXID(WebCoreAXObject*) { }
-    inline void AccessibilityObjectCache::childrenChanged(RenderObject*) { }
-    inline void AccessibilityObjectCache::postNotification(RenderObject*, const String&) { }
-    inline void AccessibilityObjectCache::postNotificationToTopWebArea(RenderObject*, const String&) { }
-    inline void AccessibilityObjectCache::handleFocusedUIElementChanged() { }
+    inline AXObjectCache::~AXObjectCache() { }
+    inline WebCoreAXObject* AXObjectCache::get(RenderObject*) { return 0; }
+    inline void AXObjectCache::remove(RenderObject*) { }
+    inline void AXObjectCache::removeAXID(WebCoreAXObject*) { }
+    inline void AXObjectCache::childrenChanged(RenderObject*) { }
+    inline void AXObjectCache::postNotification(RenderObject*, const String&) { }
+    inline void AXObjectCache::postNotificationToTopWebArea(RenderObject*, const String&) { }
+    inline void AXObjectCache::handleFocusedUIElementChanged() { }
 #endif
 
 }
similarity index 83%
rename from WebCore/kwq/AccessibilityObjectCache.mm
rename to WebCore/bridge/mac/AXObjectCacheMac.mm
index 593a987f9c4d62dd744b04f4e4d2b17a1820c0a6..ddcb645adbfb5dc7bdecdeaa93768651845fd5e1 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #import "config.h"
-#import "AccessibilityObjectCache.h"
+#import "AXObjectCache.h"
 
 #import "Document.h"
 #import "RenderObject.h"
@@ -42,9 +42,9 @@ struct TextMarkerData  {
     EAffinity affinity;
 };
 
-bool AccessibilityObjectCache::gAccessibilityEnabled = false;
+bool AXObjectCache::gAccessibilityEnabled = false;
 
-AccessibilityObjectCache::~AccessibilityObjectCache()
+AXObjectCache::~AXObjectCache()
 {
     HashMap<RenderObject*, WebCoreAXObject*>::iterator end = m_objects.end();
     for (HashMap<RenderObject*, WebCoreAXObject*>::iterator it = m_objects.begin(); it != end; ++it) {
@@ -54,7 +54,7 @@ AccessibilityObjectCache::~AccessibilityObjectCache()
     }
 }
 
-WebCoreAXObject* AccessibilityObjectCache::get(RenderObject* renderer)
+WebCoreAXObject* AXObjectCache::get(RenderObject* renderer)
 {
     WebCoreAXObject* obj = m_objects.get(renderer);
     if (obj)
@@ -67,7 +67,7 @@ WebCoreAXObject* AccessibilityObjectCache::get(RenderObject* renderer)
     return obj;
 }
 
-void AccessibilityObjectCache::remove(RenderObject* renderer)
+void AXObjectCache::remove(RenderObject* renderer)
 {
     HashMap<RenderObject*, WebCoreAXObject*>::iterator it = m_objects.find(renderer);
     if (it == m_objects.end())
@@ -80,7 +80,7 @@ void AccessibilityObjectCache::remove(RenderObject* renderer)
     ASSERT(m_objects.size() >= m_idsInUse.size());
 }
 
-AXID AccessibilityObjectCache::getAXID(WebCoreAXObject* obj)
+AXID AXObjectCache::getAXID(WebCoreAXObject* obj)
 {
     // check for already-assigned ID
     AXID objID = [obj axObjectID];
@@ -102,7 +102,7 @@ AXID AccessibilityObjectCache::getAXID(WebCoreAXObject* obj)
     return objID;
 }
 
-void AccessibilityObjectCache::removeAXID(WebCoreAXObject* obj)
+void AXObjectCache::removeAXID(WebCoreAXObject* obj)
 {
     AXID objID = [obj axObjectID];
     if (objID == 0)
@@ -113,7 +113,7 @@ void AccessibilityObjectCache::removeAXID(WebCoreAXObject* obj)
     m_idsInUse.remove(objID);
 }
 
-WebCoreTextMarker* AccessibilityObjectCache::textMarkerForVisiblePosition(const VisiblePosition& visiblePos)
+WebCoreTextMarker* AXObjectCache::textMarkerForVisiblePosition(const VisiblePosition& visiblePos)
 {
     Position deepPos = visiblePos.deepEquivalent();
     Node* domNode = deepPos.node();
@@ -137,7 +137,7 @@ WebCoreTextMarker* AccessibilityObjectCache::textMarkerForVisiblePosition(const
     return [[WebCoreViewFactory sharedFactory] textMarkerWithBytes:&textMarkerData length:sizeof(textMarkerData)]; 
 }
 
-VisiblePosition AccessibilityObjectCache::visiblePositionForTextMarker(WebCoreTextMarker* textMarker)
+VisiblePosition AXObjectCache::visiblePositionForTextMarker(WebCoreTextMarker* textMarker)
 {
     TextMarkerData textMarkerData;
     
@@ -152,26 +152,26 @@ VisiblePosition AccessibilityObjectCache::visiblePositionForTextMarker(WebCoreTe
     return VisiblePosition(textMarkerData.node, textMarkerData.offset, textMarkerData.affinity);
 }
 
-void AccessibilityObjectCache::childrenChanged(RenderObject* renderer)
+void AXObjectCache::childrenChanged(RenderObject* renderer)
 {
     WebCoreAXObject* obj = m_objects.get(renderer);
     if (obj)
         [obj childrenChanged];
 }
 
-void AccessibilityObjectCache::postNotificationToTopWebArea(RenderObject* renderer, const String& message)
+void AXObjectCache::postNotificationToTopWebArea(RenderObject* renderer, const String& message)
 {
     if (renderer)
         NSAccessibilityPostNotification(get(renderer->document()->topDocument()->renderer()), message);
 }
 
-void AccessibilityObjectCache::postNotification(RenderObject* renderer, const String& message)
+void AXObjectCache::postNotification(RenderObject* renderer, const String& message)
 {
     if (renderer)
         NSAccessibilityPostNotification(get(renderer), message);
 }
 
-void AccessibilityObjectCache::handleFocusedUIElementChanged()
+void AXObjectCache::handleFocusedUIElementChanged()
 {
     [[WebCoreViewFactory sharedFactory] accessibilityHandleFocusChanged];
 }
index 56b5a58db9d51fabdcc0cf20e9766c392853566c..fdbc41d8f5d8ddbbb6dd96a6789f393d7b692550 100644 (file)
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "FrameMac.h"
 
-#import "AccessibilityObjectCache.h"
+#import "AXObjectCache.h"
 #import "BeforeUnloadEvent.h"
 #import "BlockExceptions.h"
 #import "BrowserExtensionMac.h"
@@ -3175,8 +3175,8 @@ bool FrameMac::shouldDeleteSelection(const SelectionController &selection) const
 
 void FrameMac::respondToChangedContents()
 {
-    if (AccessibilityObjectCache::accessibilityEnabled())
-        renderer()->document()->getAccObjectCache()->postNotificationToTopWebArea(renderer(), "AXValueChanged");
+    if (AXObjectCache::accessibilityEnabled())
+        renderer()->document()->axObjectCache()->postNotificationToTopWebArea(renderer(), "AXValueChanged");
     [_bridge respondToChangedContents];
 }
 
similarity index 98%
rename from WebCore/kwq/WebCoreAXObject.h
rename to WebCore/bridge/mac/WebCoreAXObject.h
index b44a104c438af311e47353eef72439bcb5106d4a..f546bcdcedd97323048e577444a9113a91a5b4c3 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import "AccessibilityObjectCache.h"
+#import "AXObjectCache.h"
 
 namespace WebCore {
     class HTMLAreaElement;
similarity index 97%
rename from WebCore/kwq/WebCoreAXObject.mm
rename to WebCore/bridge/mac/WebCoreAXObject.mm
index 3b564af295ef1b3ce5e656ff30eaa64258ae6502..f239ae2b6eecfe25439dfdb4b1d770b359e3eb4d 100644 (file)
@@ -131,7 +131,7 @@ using namespace HTMLNames;
     RenderObject* currRenderer;
     for (currRenderer = m_renderer; currRenderer && !currRenderer->element(); currRenderer = currRenderer->parent()) {
         if (currRenderer->continuation())
-            return [currRenderer->document()->getAccObjectCache()->get(currRenderer->continuation()) anchorElement];
+            return [currRenderer->document()->axObjectCache()->get(currRenderer->continuation()) anchorElement];
     }
     
     // bail of none found
@@ -188,38 +188,38 @@ using namespace HTMLNames;
 {
     if (!m_renderer || !m_renderer->firstChild())
         return nil;
-    return m_renderer->document()->getAccObjectCache()->get(m_renderer->firstChild());
+    return m_renderer->document()->axObjectCache()->get(m_renderer->firstChild());
 }
 
 -(WebCoreAXObject*)lastChild
 {
     if (!m_renderer || !m_renderer->lastChild())
         return nil;
-    return m_renderer->document()->getAccObjectCache()->get(m_renderer->lastChild());
+    return m_renderer->document()->axObjectCache()->get(m_renderer->lastChild());
 }
 
 -(WebCoreAXObject*)previousSibling
 {
     if (!m_renderer || !m_renderer->previousSibling())
         return nil;
-    return m_renderer->document()->getAccObjectCache()->get(m_renderer->previousSibling());
+    return m_renderer->document()->axObjectCache()->get(m_renderer->previousSibling());
 }
 
 -(WebCoreAXObject*)nextSibling
 {
     if (!m_renderer || !m_renderer->nextSibling())
         return nil;
-    return m_renderer->document()->getAccObjectCache()->get(m_renderer->nextSibling());
+    return m_renderer->document()->axObjectCache()->get(m_renderer->nextSibling());
 }
 
 -(WebCoreAXObject*)parentObject
 {
     if (m_areaElement)
-        return m_renderer->document()->getAccObjectCache()->get(m_renderer);
+        return m_renderer->document()->axObjectCache()->get(m_renderer);
 
     if (!m_renderer || !m_renderer->parent())
         return nil;
-    return m_renderer->document()->getAccObjectCache()->get(m_renderer->parent());
+    return m_renderer->document()->axObjectCache()->get(m_renderer->parent());
 }
 
 -(WebCoreAXObject*)parentObjectUnignored
@@ -721,12 +721,12 @@ static IntRect boundingBoxRect(RenderObject* obj)
     if (visiblePos.isNull())
         return nil;
         
-    return m_renderer->document()->getAccObjectCache()->textMarkerForVisiblePosition(visiblePos);
+    return m_renderer->document()->axObjectCache()->textMarkerForVisiblePosition(visiblePos);
 }
 
 - (VisiblePosition) visiblePositionForTextMarker: (WebCoreTextMarker *)textMarker
 {
-    return m_renderer->document()->getAccObjectCache()->visiblePositionForTextMarker(textMarker);
+    return m_renderer->document()->axObjectCache()->visiblePositionForTextMarker(textMarker);
 }
 
 - (VisiblePosition) visiblePositionForStartOfTextMarkerRange: (WebCoreTextMarkerRange *)textMarkerRange
@@ -808,7 +808,7 @@ static IntRect boundingBoxRect(RenderObject* obj)
             while (curr) {
                 RenderObject *obj = curr->renderer();
                 if (obj) {
-                    WebCoreAXObject *axobj = obj->document()->getAccObjectCache()->get(obj);
+                    WebCoreAXObject *axobj = obj->document()->axObjectCache()->get(obj);
                     ASSERT([[axobj role] isEqualToString:@"AXLink"]);
                     if (![axobj accessibilityIsIgnored])
                         [links addObject: axobj];
@@ -949,7 +949,7 @@ static IntRect boundingBoxRect(RenderObject* obj)
     if (!obj)
         return nil;
     
-    return obj->document()->getAccObjectCache()->get(obj);
+    return obj->document()->axObjectCache()->get(obj);
 }
 
 - (id)doAXTextMarkerRangeForUIElement: (id) uiElement
@@ -1260,12 +1260,12 @@ static WebCoreAXObject *AXLinkElementForNode (Node *node)
     if (!obj)
         return nil;
 
-    WebCoreAXObject *axObj = obj->document()->getAccObjectCache()->get(obj);
+    WebCoreAXObject *axObj = obj->document()->axObjectCache()->get(obj);
     HTMLAnchorElement* anchor = [axObj anchorElement];
     if (!anchor || !anchor->renderer())
         return nil;
 
-    return anchor->renderer()->document()->getAccObjectCache()->get(anchor->renderer());
+    return anchor->renderer()->document()->axObjectCache()->get(anchor->renderer());
 }
 
 static void AXAttributedStringAppendText(NSMutableAttributedString* attrString, Node* nodeImpl, const UChar* chars, int length)
@@ -1311,7 +1311,7 @@ static void AXAttributedStringAppendReplaced (NSMutableAttributedString *attrStr
     }
         
     // create an AX object, but skip it if it is not supposed to be seen
-    WebCoreAXObject *obj = replacedNode->renderer()->document()->getAccObjectCache()->get(replacedNode->renderer());
+    WebCoreAXObject *obj = replacedNode->renderer()->document()->axObjectCache()->get(replacedNode->renderer());
     if ([obj accessibilityIsIgnored])
         return;
     
@@ -1765,7 +1765,7 @@ static void AXAttributedStringAppendReplaced (NSMutableAttributedString *attrStr
     if (!obj)
         return NSAccessibilityUnignoredAncestor(self);
     
-    return NSAccessibilityUnignoredAncestor(obj->document()->getAccObjectCache()->get(obj));
+    return NSAccessibilityUnignoredAncestor(obj->document()->axObjectCache()->get(obj));
 }
 
 - (RenderObject *) rendererForView:(NSView *)view
@@ -1808,7 +1808,7 @@ static void AXAttributedStringAppendReplaced (NSMutableAttributedString *attrStr
     if (!renderer)
         return nil;
         
-    WebCoreAXObject* obj = renderer->document()->getAccObjectCache()->get(renderer);
+    WebCoreAXObject* obj = renderer->document()->axObjectCache()->get(renderer);
     return [obj parentObjectUnignored];
 }
 
@@ -1819,7 +1819,7 @@ static void AXAttributedStringAppendReplaced (NSMutableAttributedString *attrStr
     if (!focusNode || !focusNode->renderer())
         return nil;
 
-    WebCoreAXObject* obj = focusNode->renderer()->document()->getAccObjectCache()->get(focusNode->renderer());
+    WebCoreAXObject* obj = focusNode->renderer()->document()->axObjectCache()->get(focusNode->renderer());
     
     // the HTML element, for example, is focusable but has an AX object that is ignored
     if ([obj accessibilityIsIgnored])
@@ -1919,7 +1919,7 @@ static void AXAttributedStringAppendReplaced (NSMutableAttributedString *attrStr
 {
     if (!m_id)
         return;
-    m_renderer->document()->getAccObjectCache()->removeAXID(self);
+    m_renderer->document()->axObjectCache()->removeAXID(self);
 }
 
 @end
index 8a28eb5523b5b6917163d146a5b32e512c19d481..e8e936d91a82204ad27b607e7b338d688865f5cd 100644 (file)
@@ -27,7 +27,7 @@
 #import "config.h"
 #import "WebCoreFrameBridge.h"
 
-#import "AccessibilityObjectCache.h"
+#import "AXObjectCache.h"
 #import "Cache.h"
 #import "CharsetNames.h"
 #import "DOMImplementation.h"
@@ -1555,13 +1555,13 @@ static HTMLFormElement *formElementFromDOMElement(DOMElement *element)
 
 - (id)accessibilityTree
 {
-    AccessibilityObjectCache::enableAccessibility();
+    AXObjectCache::enableAccessibility();
     if (!m_frame || !m_frame->document())
         return nil;
     RenderView* root = static_cast<RenderView *>(m_frame->document()->renderer());
     if (!root)
         return nil;
-    return m_frame->document()->getAccObjectCache()->get(root);
+    return m_frame->document()->axObjectCache()->get(root);
 }
 
 - (void)setDrawsBackground:(BOOL)drawsBackground
@@ -2531,7 +2531,7 @@ static NSCharacterSet *_getPostSmartSet(void)
     if (!doc)
         return NO;
 
-    CachedObject* o = doc->docLoader()->cachedObject([URL absoluteString]);
+    CachedResource* o = doc->docLoader()->cachedObject([URL absoluteString]);
     if (!o)
         return NO;
 
@@ -2550,13 +2550,13 @@ static NSCharacterSet *_getPostSmartSet(void)
         return;
     }
 
-    const HashMap<String, CachedObject*>& allResources = doc->docLoader()->allCachedObjects();
+    const HashMap<String, CachedResource*>& allResources = doc->docLoader()->allCachedObjects();
 
     NSMutableArray *d = [[NSMutableArray alloc] initWithCapacity:allResources.size()];
     NSMutableArray *r = [[NSMutableArray alloc] initWithCapacity:allResources.size()];
 
-    HashMap<String, CachedObject*>::const_iterator end = allResources.end();
-    for (HashMap<String, CachedObject*>::const_iterator it = allResources.begin(); it != end; ++it) {
+    HashMap<String, CachedResource*>::const_iterator end = allResources.end();
+    for (HashMap<String, CachedResource*>::const_iterator it = allResources.begin(); it != end; ++it) {
         [d addObject:it->second->allData()];
         [r addObject:it->second->response()];
     }
index e775ba850612ae046d6f4cffa6ffe1cbc8fbada4..ea1b31c4ec4ab495947b3dde9cc7c902273151dc 100644 (file)
 #define CSSImageValue_H
 
 #include "CSSPrimitiveValue.h"
-#include "CachedObjectClient.h"
+#include "CachedResourceClient.h"
 
 namespace WebCore {
 
 class DocLoader;
 
-class CSSImageValue : public CSSPrimitiveValue, public CachedObjectClient
+class CSSImageValue : public CSSPrimitiveValue, public CachedResourceClient
 {
 public:
     CSSImageValue();
index 0fbb7e40fa6c5e58b3f03ace0410b3ee4282ab13..ff781fa77499949bfb7c215883b0007a08cf9139 100644 (file)
@@ -25,7 +25,7 @@
 #define CSSImportRule_H
 
 #include "CSSRule.h"
-#include "CachedObjectClient.h"
+#include "CachedResourceClient.h"
 #include "PlatformString.h"
 
 namespace WebCore {
@@ -33,7 +33,7 @@ namespace WebCore {
 class CachedCSSStyleSheet;
 class MediaList;
 
-class CSSImportRule : public CSSRule, public CachedObjectClient
+class CSSImportRule : public CSSRule, public CachedResourceClient
 {
 public:
     CSSImportRule(StyleBase* parent, const String& href, MediaList*);
@@ -48,7 +48,7 @@ public:
   
     bool isLoading() const;
 
-    // from CachedObjectClient
+    // from CachedResourceClient
     virtual void setStyleSheet(const String& url, const String& sheet);
 
     virtual void insertedIntoParent();
index f8ee26cfa6a259963e3684d27d5443d5e33bae31..36aeee744db1a0877132b7f07565544646ce13f6 100644 (file)
@@ -25,7 +25,7 @@
 #include "config.h"
 #include "Document.h"
 
-#include "AccessibilityObjectCache.h"
+#include "AXObjectCache.h"
 #include "CDATASection.h"
 #include "CSSStyleSheet.h"
 #include "CSSValueKeywords.h"
@@ -241,7 +241,7 @@ Document::Document(DOMImplementation* impl, FrameView *v)
     m_view = v;
     m_renderArena = 0;
 
-    m_accCache = 0;
+    m_axObjectCache = 0;
     
     m_docLoader = new DocLoader(v ? v->frame() : 0, this);
 
@@ -348,9 +348,9 @@ Document::~Document()
 
     deleteAllValues(m_markers);
 
-    if (m_accCache) {
-        delete m_accCache;
-        m_accCache = 0;
+    if (m_axObjectCache) {
+        delete m_axObjectCache;
+        m_axObjectCache = 0;
     }
     m_decoder = 0;
     
@@ -968,7 +968,7 @@ void Document::detach()
     
     if (m_inPageCache) {
         if (render)
-            getAccObjectCache()->remove(render);
+            axObjectCache()->remove(render);
         return;
     }
 
@@ -1024,33 +1024,33 @@ void Document::removeAllDisconnectedNodeEventListeners()
     m_disconnectedNodesWithEventListeners.clear();
 }
 
-AccessibilityObjectCache* Document::getAccObjectCache() const
+AXObjectCache* Document::axObjectCache() const
 {
-    // The only document that actually has a AccessibilityObjectCache is the top-level
+    // The only document that actually has a AXObjectCache is the top-level
     // document.  This is because we need to be able to get from any WebCoreAXObject
     // to any other WebCoreAXObject on the same page.  Using a single cache allows
     // lookups across nested webareas (i.e. multiple documents).
     
-    if (m_accCache) {
+    if (m_axObjectCache) {
         // return already known top-level cache
         if (!ownerElement())
-            return m_accCache;
+            return m_axObjectCache;
         
         // In some pages with frames, the cache is created before the sub-webarea is
         // inserted into the tree.  Here, we catch that case and just toss the old
         // cache and start over.
-        delete m_accCache;
-        m_accCache = 0;
+        delete m_axObjectCache;
+        m_axObjectCache = 0;
     }
 
     // ask the top-level document for its cache
     Document* doc = topDocument();
     if (doc != this)
-        return doc->getAccObjectCache();
+        return doc->axObjectCache();
     
     // this is the top-level document, so install a new cache
-    m_accCache = new AccessibilityObjectCache;
-    return m_accCache;
+    m_axObjectCache = new AXObjectCache;
+    return m_axObjectCache;
 }
 
 void Document::setVisuallyOrdered()
@@ -1096,8 +1096,8 @@ void Document::updateSelection()
     // or loses focus, and once for every low level change to the selection during an editing operation.
     // FIXME: We no longer blow away the selection before starting an editing operation, so the isNotNull checks below are no 
     // longer a correct way to check for user-level selection changes.
-    if (AccessibilityObjectCache::accessibilityEnabled() && s.start().isNotNull() && s.end().isNotNull()) {
-        getAccObjectCache()->postNotificationToTopWebArea(renderer(), "AXSelectedTextChanged");
+    if (AXObjectCache::accessibilityEnabled() && s.start().isNotNull() && s.end().isNotNull()) {
+        axObjectCache()->postNotificationToTopWebArea(renderer(), "AXSelectedTextChanged");
     }
 #endif
 }
@@ -1243,8 +1243,8 @@ void Document::implicitClose()
             view()->layout();
     }
 #if __APPLE__
-    if (renderer() && AccessibilityObjectCache::accessibilityEnabled())
-        getAccObjectCache()->postNotification(renderer(), "AXLoadComplete");
+    if (renderer() && AXObjectCache::accessibilityEnabled())
+        axObjectCache()->postNotification(renderer(), "AXLoadComplete");
 #endif
 
 #if SVG_SUPPORT
@@ -2138,8 +2138,8 @@ bool Document::setFocusNode(PassRefPtr<Node> newFocusNode)
    }
 
 #if __APPLE__
-    if (!focusChangeBlocked && m_focusNode && AccessibilityObjectCache::accessibilityEnabled())
-        getAccObjectCache()->handleFocusedUIElementChanged();
+    if (!focusChangeBlocked && m_focusNode && AXObjectCache::accessibilityEnabled())
+        axObjectCache()->handleFocusedUIElementChanged();
 #endif
 
 SetFocusNodeDone:
index 6c91d6162566b0dd1010678dce2f93829b053949..525b9214a89e59e4ddee3b637e58c785ab5bf726 100644 (file)
@@ -46,7 +46,7 @@ namespace XBL {
 
 namespace WebCore {
 
-    class AccessibilityObjectCache;
+    class AXObjectCache;
     class Attr;
     class Attribute;
     class CDATASection;
@@ -300,7 +300,7 @@ public:
 
     RenderArena* renderArena() { return m_renderArena; }
 
-    AccessibilityObjectCache* getAccObjectCache() const;
+    AXObjectCache* axObjectCache() const;
     
     // to get visually ordered hebrew and arabic pages right
     void setVisuallyOrdered();
@@ -676,7 +676,7 @@ protected:
     typedef HashMap<RefPtr<Node>, MarkerMapVectorPair*> MarkerMap;
     MarkerMap m_markers;
 
-    mutable AccessibilityObjectCache* m_accCache;
+    mutable AXObjectCache* m_axObjectCache;
     
     DeprecatedPtrList<HTMLImageLoader> m_imageLoadEventDispatchSoonList;
     DeprecatedPtrList<HTMLImageLoader> m_imageLoadEventDispatchingList;
index 22dc1c30dee65e19fffaa1396fd3e952988220fa..57203ebba999c0627b0c2a139657dc09c003486e 100644 (file)
@@ -24,7 +24,7 @@
 #ifndef Notation_H
 #define Notation_H
 
-#include "CachedObjectClient.h"
+#include "CachedResourceClient.h"
 #include "ContainerNode.h"
 
 namespace WebCore {
index c07291e842bc62a947ef549da64569e326390071..98244b69e1573a561a377a4fff26e71020833c27 100644 (file)
 #ifndef ProcessingInstruction_H
 #define ProcessingInstruction_H
 
-#include "CachedObjectClient.h"
+#include "CachedResourceClient.h"
 #include "ContainerNode.h"
 
 namespace WebCore {
 
 class StyleSheet;
 
-class ProcessingInstruction : public ContainerNode, private CachedObjectClient
+class ProcessingInstruction : public ContainerNode, private CachedResourceClient
 {
 public:
     ProcessingInstruction(Document*);
@@ -69,7 +69,7 @@ private:
     RefPtr<StringImpl> m_target;
     RefPtr<StringImpl> m_data;
     RefPtr<StringImpl> m_localHref;
-    CachedObject* m_cachedSheet;
+    CachedResource* m_cachedSheet;
     RefPtr<StyleSheet> m_sheet;
     bool m_loading;
 #ifdef KHTML_XSLT
index cc5ce2319c3cbffccbb886d17bc3d4f4f2b71f28..f2318d2a04bfb1263cad8b3ba90c9d50e5c5da90 100644 (file)
@@ -67,7 +67,7 @@ typedef HashMap<StringImpl *, StringImpl *> PrefixForNamespaceMap;
 
 class PendingCallbacks;
 
-class XMLTokenizer : public Tokenizer, public CachedObjectClient
+class XMLTokenizer : public Tokenizer, public CachedResourceClient
 {
 public:
     XMLTokenizer(Document *, FrameView * = 0);
@@ -90,8 +90,8 @@ public:
     void setIsXHTMLDocument(bool isXHTML) { m_isXHTMLDocument = isXHTML; }
     bool isXHTMLDocument() const { return m_isXHTMLDocument; }
 
-    // from CachedObjectClient
-    virtual void notifyFinished(CachedObject *finishedObj);
+    // from CachedResourceClient
+    virtual void notifyFinished(CachedResource *finishedObj);
 
     // callbacks from parser SAX
     void error(ErrorType, const char *message, va_list args);
@@ -1293,7 +1293,7 @@ void XMLTokenizer::insertErrorMessageBlock()
     doc->updateRendering();
 }
 
-void XMLTokenizer::notifyFinished(CachedObject *finishedObj)
+void XMLTokenizer::notifyFinished(CachedResource *finishedObj)
 {
     ASSERT(m_pendingScript == finishedObj);
     ASSERT(m_pendingScript->accessCount() > 0);
index 0a7bbc03d0aac0c57b21d3c8b0ce6c74c87a2036..57b489b0f0e9ed681741ffb7509f66a260ba58c8 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef HTMLImagePattern_h
 #define HTMLImagePattern_h
 
-#include "CachedObjectClient.h"
+#include "CachedResourceClient.h"
 #include "Shared.h"
 
 #if __APPLE__
@@ -40,7 +40,7 @@ namespace WebCore {
 
     typedef int ExceptionCode;
 
-    class CanvasPattern : public Shared<CanvasPattern>, CachedObjectClient {
+    class CanvasPattern : public Shared<CanvasPattern>, CachedResourceClient {
     public:
         static void parseRepetitionType(const String&, bool& repeatX, bool& repeatY, ExceptionCode&);
 
index 1e9de08a3c8fad874a5240dc39e3e034bf85083d..8afcb8998da285153a2bcdfeb9a026ffe14758f5 100644 (file)
@@ -25,7 +25,7 @@
 #ifndef HTML_DOCUMENTIMPL_H
 #define HTML_DOCUMENTIMPL_H
 
-#include "CachedObjectClient.h"
+#include "CachedResourceClient.h"
 #include "Document.h"
 #include "HTMLCollection.h"
 
@@ -36,7 +36,7 @@ namespace WebCore {
 class FrameView;
 class HTMLElement;
 
-class HTMLDocument : public WebCore::Document, public WebCore::CachedObjectClient
+class HTMLDocument : public WebCore::Document, public WebCore::CachedResourceClient
 {
 public:
     HTMLDocument(DOMImplementation *_implementation, FrameView *v = 0);
index 46cb42ff7bdc77f635123c05bc7573e21ebd1691..744498e80fee1bca7af79c1ab9e0658c672d2aa6 100644 (file)
@@ -108,7 +108,7 @@ void HTMLImageLoader::dispatchLoadEvent()
     }
 }
 
-void HTMLImageLoader::notifyFinished(CachedObject *image)
+void HTMLImageLoader::notifyFinished(CachedResource *image)
 {
     m_imageComplete = true;
     Element* elem = element();
index 215d2cd85bcb44d1d6b61e3ee27d141e88e10f1e..cd4b9566e4e2888a32bb2560e19c5ba39cce2f35 100644 (file)
 #ifndef HTMLImageLoader_H
 #define HTMLImageLoader_H
 
-#include "CachedObjectClient.h"
+#include "CachedResourceClient.h"
 
 namespace WebCore {
 
 class Element;
 
-class HTMLImageLoader : public CachedObjectClient {
+class HTMLImageLoader : public CachedResourceClient {
 public:
     HTMLImageLoader(Element*);
     virtual ~HTMLImageLoader();
@@ -46,8 +46,8 @@ public:
 
     void setLoadManually(bool loadManually) { m_loadManually = loadManually; }
 
-    // CachedObjectClient API
-    virtual void notifyFinished(CachedObject*);
+    // CachedResourceClient API
+    virtual void notifyFinished(CachedResource*);
 
 protected:
     void setLoadingImage(CachedImage*);
index dcc9c181dc85f3cb769f7d073764a79f918450da..45a70a0930aa9bf5bb9aba227365be526d406f0f 100644 (file)
 #define HTMLLinkElement_H
 
 #include "HTMLElement.h"
-#include "CachedObjectClient.h"
+#include "CachedResourceClient.h"
 #include "CSSStyleSheet.h"
 
 namespace WebCore {
 
 class CachedCSSStyleSheet;
 
-class HTMLLinkElement : public HTMLElement, public CachedObjectClient
+class HTMLLinkElement : public HTMLElement, public CachedResourceClient
 {
 public:
     HTMLLinkElement(Document*);
@@ -78,7 +78,7 @@ public:
     virtual void insertedIntoDocument();
     virtual void removedFromDocument();
 
-    // from CachedObjectClient
+    // from CachedResourceClient
     virtual void setStyleSheet(const String &url, const String &sheet);
     bool isLoading() const;
     void sheetLoaded();
index c905fab7050eea33bf742871742c073b003495b7..350e84c95fc272ce40bcc5a349d659c0f1b77d15 100644 (file)
@@ -140,7 +140,7 @@ void HTMLScriptElement::removedFromDocument()
     }
 }
 
-void HTMLScriptElement::notifyFinished(CachedObject* o)
+void HTMLScriptElement::notifyFinished(CachedResource* o)
 {
     CachedScript *cs = static_cast<CachedScript *>(o);
 
index 48101384355cccbbb6b12cb261ac108fd9600c34..c1d6ea693402d9104e40c44f5a5b08709f6beb7a 100644 (file)
 #define HTMLScriptElement_H
 
 #include "HTMLElement.h"
-#include "CachedObjectClient.h"
+#include "CachedResourceClient.h"
 
 namespace WebCore {
 
 class CachedScript;
 
-class HTMLScriptElement : public HTMLElement, public CachedObjectClient
+class HTMLScriptElement : public HTMLElement, public CachedResourceClient
 {
 public:
     HTMLScriptElement(Document *doc);
@@ -44,7 +44,7 @@ public:
     virtual void parseMappedAttribute(MappedAttribute *attr);
     virtual void insertedIntoDocument();
     virtual void removedFromDocument();
-    virtual void notifyFinished(CachedObject *finishedObj);
+    virtual void notifyFinished(CachedResource *finishedObj);
 
     virtual void childrenChanged();
 
index 33b931c1602d8197ff5e143dd47f4127b856f916..6bd29e6f0020f6687fc47e47d81b6619b98aa379 100644 (file)
@@ -1657,7 +1657,7 @@ void HTMLTokenizer::enlargeScriptBuffer(int len)
     scriptCodeMaxSize = newSize;
 }
 
-void HTMLTokenizer::notifyFinished(CachedObject*)
+void HTMLTokenizer::notifyFinished(CachedResource*)
 {
 #if INSTRUMENT_LAYOUT_SCHEDULING
     if (!m_doc->ownerElement())
index 52ff09b25734c0987036b2f8e00abaf9f6937d5d..4874219eba35f292ebf031ef933e679300c77c7f 100644 (file)
@@ -31,7 +31,7 @@
 #include "SegmentedString.h"
 #include "Timer.h"
 #include "XMLTokenizer.h"
-#include "CachedObjectClient.h"
+#include "CachedResourceClient.h"
 
 namespace WebCore {
 
@@ -78,7 +78,7 @@ public:
 
 //-----------------------------------------------------------------------------
 
-class HTMLTokenizer : public Tokenizer, public CachedObjectClient
+class HTMLTokenizer : public Tokenizer, public CachedResourceClient
 {
 public:
     HTMLTokenizer(HTMLDocument*);
@@ -136,8 +136,8 @@ private:
     void timerFired(Timer<HTMLTokenizer>*);
     void allDataProcessed();
 
-    // from CachedObjectClient
-    void notifyFinished(CachedObject *finishedObj);
+    // from CachedResourceClient
+    void notifyFinished(CachedResource *finishedObj);
 
     // Internal buffers
     ///////////////////
index 2c6d55b66a3b73e3f749d2a1a93470e55ed82cd6..c43fe202f8ee9b0e2191284b98e36a328c065e4b 100644 (file)
@@ -503,7 +503,7 @@ private:
     float m_y;
 };
 
-class KCanvasFEImage : public KCanvasFilterEffect, public CachedObjectClient
+class KCanvasFEImage : public KCanvasFilterEffect, public CachedResourceClient
 {
 public:
     KCanvasFEImage(): m_cachedImage(0) { }
index ff3d301bd575a40c26609ae53d9ee021c181c2b9..edd59d5e122fd8959debc4e3e6b3e3e1d07a0969 100644 (file)
@@ -36,7 +36,7 @@
 using namespace WebCore;
 
 SVGCursorElement::SVGCursorElement(const QualifiedName& tagName, Document *doc)
-: SVGElement(tagName, doc), SVGTests(), SVGExternalResourcesRequired(), SVGURIReference(), CachedObjectClient()
+: SVGElement(tagName, doc), SVGTests(), SVGExternalResourcesRequired(), SVGURIReference(), CachedResourceClient()
 {
     m_cachedImage = 0;
 }
index 01f346a755eb320c3b898306ad0dcaace757cfeb..0d67ef3ba10c65b131decb0919720daf36c8f809 100644 (file)
@@ -30,7 +30,7 @@
 #include "SVGTests.h"
 #include "SVGURIReference.h"
 #include "SVGExternalResourcesRequired.h"
-#include "CachedObjectClient.h"
+#include "CachedResourceClient.h"
 
 namespace WebCore
 {
@@ -40,7 +40,7 @@ namespace WebCore
                                  public SVGTests,
                                  public SVGExternalResourcesRequired,
                                  public SVGURIReference,
-                                 public CachedObjectClient
+                                 public CachedResourceClient
     {
     public:
         SVGCursorElement(const QualifiedName&, Document*);
index 04d6b508fd0cf451c0365280289006e0c4017807..25f3b5f4e05358d4e5a3bd7a25c43fdd76f6b122 100644 (file)
@@ -83,7 +83,7 @@ void SVGFEImageElement::parseMappedAttribute(MappedAttribute *attr)
     }
 }
 
-void SVGFEImageElement::notifyFinished(CachedObject *finishedObj)
+void SVGFEImageElement::notifyFinished(CachedResource *finishedObj)
 {
     if (finishedObj == m_cachedImage && filterEffect())
         filterEffect()->setCachedImage(m_cachedImage);
index d60a8ab8ee23b2450e2e040f212168b591559851..f0d38147bf428a63ce0dd73d317a64604fb8e46b 100644 (file)
@@ -37,7 +37,7 @@ namespace WebCore {
                                   public SVGURIReference,
                                   public SVGLangSpace,
                                   public SVGExternalResourcesRequired,
-                                  public CachedObjectClient
+                                  public CachedResourceClient
     {
     public:
         SVGFEImageElement(const QualifiedName&, Document*);
@@ -47,7 +47,7 @@ namespace WebCore {
         SVGAnimatedPreserveAspectRatio *preserveAspectRatio() const;
 
         virtual void parseMappedAttribute(MappedAttribute *attr);
-        virtual void notifyFinished(CachedObject *finishedObj);
+        virtual void notifyFinished(CachedResource *finishedObj);
 
     protected:
         virtual KCanvasFEImage *filterEffect() const;
index 8bcfb7ef2da5abc09f664c94388435944f481179..79f110a817a0331276df5b1fa7951df60e91a94a 100644 (file)
@@ -50,14 +50,14 @@ const int minMaxCacheableObjectSize = 80 * 1024;
 const int maxLRULists = 20;
     
 struct LRUList {
-    CachedObject* m_head;
-    CachedObject* m_tail;
+    CachedResource* m_head;
+    CachedResource* m_tail;
     LRUList() : m_head(0), m_tail(0) { }
 };
 
 static bool cacheDisabled;
 
-typedef HashMap<RefPtr<StringImpl>, CachedObject*> CacheMap;
+typedef HashMap<RefPtr<StringImpl>, CachedResource*> CacheMap;
 
 static CacheMap* cache = 0;
 
@@ -71,7 +71,7 @@ int Cache::flushCount = 0;
 Image *Cache::nullImage = 0;
 Image *Cache::brokenImage = 0;
 
-CachedObject *Cache::m_headOfUncacheableList = 0;
+CachedResource *Cache::m_headOfUncacheableList = 0;
 int Cache::m_totalSizeOfLRULists = 0;
 int Cache::m_countOfLRUAndUncacheableLists;
 LRUList *Cache::m_LRULists = 0;
@@ -109,7 +109,7 @@ void Cache::clear()
     delete docloaders; docloaders = 0;
 }
 
-void Cache::updateCacheStatus(DocLoader* dl, CachedObject* o)
+void Cache::updateCacheStatus(DocLoader* dl, CachedResource* o)
 {
     moveToHeadOfLRUList(o);
     if (dl) {
@@ -145,7 +145,7 @@ CachedImage* Cache::requestImage(DocLoader* dl, const KURL& url, bool reload, ti
     if (!dl->doc()->shouldCreateRenderers())
         return 0;
 
-    CachedObject *o = 0;
+    CachedResource *o = 0;
     if (!reload)
         o = cache->get(String(url.url()).impl());
     if (!o) {
@@ -164,11 +164,11 @@ CachedImage* Cache::requestImage(DocLoader* dl, const KURL& url, bool reload, ti
     }
 
     
-    if (o->type() != CachedObject::ImageResource)
+    if (o->type() != CachedResource::ImageResource)
         return 0;
 
 #ifdef CACHE_DEBUG
-    if (o->status() == CachedObject::Pending)
+    if (o->status() == CachedResource::Pending)
         kdDebug(6060) << "Cache: loading in progress: " << kurl.url() << endl;
     else
         kdDebug(6060) << "Cache: using cached: " << kurl.url() << ", status " << o->status() << endl;
@@ -193,7 +193,7 @@ CachedCSSStyleSheet* Cache::requestStyleSheet(DocLoader* dl, const String& url,
 
     // Checking if the URL is malformed is lots of extra work for little benefit.
 
-    CachedObject *o = cache->get(String(kurl.url()).impl());
+    CachedResource *o = cache->get(String(kurl.url()).impl());
     if (!o) {
 #ifdef CACHE_DEBUG
         kdDebug(6060) << "Cache: new: " << kurl.url() << endl;
@@ -209,7 +209,7 @@ CachedCSSStyleSheet* Cache::requestStyleSheet(DocLoader* dl, const String& url,
     }
 
     
-    if (o->type() != CachedObject::CSSStyleSheet)
+    if (o->type() != CachedResource::CSSStyleSheet)
     {
 #ifdef CACHE_DEBUG
         kdDebug(6060) << "Cache::Internal Error in requestStyleSheet url=" << kurl.url() << "!" << endl;
@@ -218,7 +218,7 @@ CachedCSSStyleSheet* Cache::requestStyleSheet(DocLoader* dl, const String& url,
     }
 
 #ifdef CACHE_DEBUG
-    if (o->status() == CachedObject::Pending)
+    if (o->status() == CachedResource::Pending)
         kdDebug(6060) << "Cache: loading in progress: " << kurl.url() << endl;
     else
         kdDebug(6060) << "Cache: using cached: " << kurl.url() << endl;
@@ -243,7 +243,7 @@ CachedScript* Cache::requestScript(DocLoader* dl, const String& url, bool reload
 
     // Checking if the URL is malformed is lots of extra work for little benefit.
 
-    CachedObject *o = cache->get(String(kurl.url()).impl());
+    CachedResource *o = cache->get(String(kurl.url()).impl());
     if (!o)
     {
 #ifdef CACHE_DEBUG
@@ -260,7 +260,7 @@ CachedScript* Cache::requestScript(DocLoader* dl, const String& url, bool reload
     }
 
     
-    if (!(o->type() == CachedObject::Script)) {
+    if (!(o->type() == CachedResource::Script)) {
 #ifdef CACHE_DEBUG
         kdDebug(6060) << "Cache::Internal Error in requestScript url=" << kurl.url() << "!" << endl;
 #endif
@@ -269,7 +269,7 @@ CachedScript* Cache::requestScript(DocLoader* dl, const String& url, bool reload
     
     
 #ifdef CACHE_DEBUG
-    if (o->status() == CachedObject::Pending)
+    if (o->status() == CachedResource::Pending)
         kdDebug(6060) << "Cache: loading in progress: " << kurl.url() << endl;
     else
         kdDebug(6060) << "Cache: using cached: " << kurl.url() << endl;
@@ -296,7 +296,7 @@ CachedXSLStyleSheet* Cache::requestXSLStyleSheet(DocLoader* dl, const String& ur
     
     // Checking if the URL is malformed is lots of extra work for little benefit.
     
-    CachedObject *o = cache->get(String(kurl.url()).impl());
+    CachedResource *o = cache->get(String(kurl.url()).impl());
     if (!o) {
 #ifdef CACHE_DEBUG
         kdDebug(6060) << "Cache: new: " << kurl.url() << endl;
@@ -312,7 +312,7 @@ CachedXSLStyleSheet* Cache::requestXSLStyleSheet(DocLoader* dl, const String& ur
     }
     
     
-    if (o->type() != CachedObject::XSLStyleSheet) {
+    if (o->type() != CachedResource::XSLStyleSheet) {
 #ifdef CACHE_DEBUG
         kdDebug(6060) << "Cache::Internal Error in requestXSLStyleSheet url=" << kurl.url() << "!" << endl;
 #endif
@@ -320,7 +320,7 @@ CachedXSLStyleSheet* Cache::requestXSLStyleSheet(DocLoader* dl, const String& ur
     }
     
 #ifdef CACHE_DEBUG
-    if (o->status() == CachedObject::Pending)
+    if (o->status() == CachedResource::Pending)
         kdDebug(6060) << "Cache: loading in progress: " << kurl.url() << endl;
     else
         kdDebug(6060) << "Cache: using cached: " << kurl.url() << endl;
@@ -348,7 +348,7 @@ CachedXBLDocument* Cache::requestXBLDocument(DocLoader* dl, const String& url, b
     
     // Checking if the URL is malformed is lots of extra work for little benefit.
     
-    CachedObject *o = cache->get(String(kurl.url()).impl());
+    CachedResource *o = cache->get(String(kurl.url()).impl());
     if (!o) {
 #ifdef CACHE_DEBUG
         kdDebug(6060) << "Cache: new: " << kurl.url() << endl;
@@ -364,7 +364,7 @@ CachedXBLDocument* Cache::requestXBLDocument(DocLoader* dl, const String& url, b
     }
     
     
-    if (o->type() != CachedObject::XBL) {
+    if (o->type() != CachedResource::XBL) {
 #ifdef CACHE_DEBUG
         kdDebug(6060) << "Cache::Internal Error in requestXBLDocument url=" << kurl.url() << "!" << endl;
 #endif
@@ -372,7 +372,7 @@ CachedXBLDocument* Cache::requestXBLDocument(DocLoader* dl, const String& url, b
     }
     
 #ifdef CACHE_DEBUG
-    if (o->status() == CachedObject::Pending)
+    if (o->status() == CachedResource::Pending)
         kdDebug(6060) << "Cache: loading in progress: " << kurl.url() << endl;
     else
         kdDebug(6060) << "Cache: using cached: " << kurl.url() << endl;
@@ -418,9 +418,9 @@ void Cache::setSize(int bytes)
     flush(true);
 }
 
-void Cache::remove(CachedObject *object)
+void Cache::remove(CachedResource *object)
 {
-  // this indicates the deref() method of CachedObject to delete itself when the reference counter
+  // this indicates the deref() method of CachedResource to delete itself when the reference counter
   // drops down to zero
   object->setFree(true);
 
@@ -453,7 +453,7 @@ static inline int FastLog2(uint32_t i)
     return log2;
 }
 
-LRUList* Cache::getLRUListFor(CachedObject* o)
+LRUList* Cache::getLRUListFor(CachedResource* o)
 {
     int accessCount = o->accessCount();
     int queueIndex;
@@ -472,14 +472,14 @@ LRUList* Cache::getLRUListFor(CachedObject* o)
     return &m_LRULists[queueIndex];
 }
 
-void Cache::removeFromLRUList(CachedObject *object)
+void Cache::removeFromLRUList(CachedResource *object)
 {
-    CachedObject *next = object->m_nextInLRUList;
-    CachedObject *prev = object->m_prevInLRUList;
-    bool uncacheable = object->status() == CachedObject::Uncacheable;
+    CachedResource *next = object->m_nextInLRUList;
+    CachedResource *prev = object->m_prevInLRUList;
+    bool uncacheable = object->status() == CachedResource::Uncacheable;
     
     LRUList* list = uncacheable ? 0 : getLRUListFor(object);
-    CachedObject *&head = uncacheable ? m_headOfUncacheableList : list->m_head;
+    CachedResource *&head = uncacheable ? m_headOfUncacheableList : list->m_head;
     
     if (next == 0 && prev == 0 && head != object) {
         return;
@@ -504,12 +504,12 @@ void Cache::removeFromLRUList(CachedObject *object)
         m_totalSizeOfLRULists -= object->size();
 }
 
-void Cache::moveToHeadOfLRUList(CachedObject *object)
+void Cache::moveToHeadOfLRUList(CachedResource *object)
 {
     insertInLRUList(object);
 }
 
-void Cache::insertInLRUList(CachedObject *object)
+void Cache::insertInLRUList(CachedResource *object)
 {
     removeFromLRUList(object);
     
@@ -518,8 +518,8 @@ void Cache::insertInLRUList(CachedObject *object)
     
     LRUList* list = getLRUListFor(object);
     
-    bool uncacheable = object->status() == CachedObject::Uncacheable;
-    CachedObject *&head = uncacheable ? m_headOfUncacheableList : list->m_head;
+    bool uncacheable = object->status() == CachedResource::Uncacheable;
+    CachedResource *&head = uncacheable ? m_headOfUncacheableList : list->m_head;
 
     object->m_nextInLRUList = head;
     if (head)
@@ -535,9 +535,9 @@ void Cache::insertInLRUList(CachedObject *object)
         m_totalSizeOfLRULists += object->size();
 }
 
-bool Cache::adjustSize(CachedObject *object, int delta)
+bool Cache::adjustSize(CachedResource *object, int delta)
 {
-    if (object->status() == CachedObject::Uncacheable)
+    if (object->status() == CachedResource::Uncacheable)
         return false;
 
     if (object->m_nextInLRUList == 0 && object->m_prevInLRUList == 0 &&
@@ -557,30 +557,30 @@ Cache::Statistics Cache::getStatistics()
 
     CacheMap::iterator e = cache->end();
     for (CacheMap::iterator i = cache->begin(); i != e; ++i) {
-        CachedObject *o = i->second;
+        CachedResource *o = i->second;
         switch (o->type()) {
-            case CachedObject::ImageResource:
+            case CachedResource::ImageResource:
                 stats.images.count++;
                 stats.images.size += o->size();
                 break;
 
-            case CachedObject::CSSStyleSheet:
+            case CachedResource::CSSStyleSheet:
                 stats.styleSheets.count++;
                 stats.styleSheets.size += o->size();
                 break;
 
-            case CachedObject::Script:
+            case CachedResource::Script:
                 stats.scripts.count++;
                 stats.scripts.size += o->size();
                 break;
 #ifdef KHTML_XSLT
-            case CachedObject::XSLStyleSheet:
+            case CachedResource::XSLStyleSheet:
                 stats.xslStyleSheets.count++;
                 stats.xslStyleSheets.size += o->size();
                 break;
 #endif
 #ifndef KHTML_NO_XBL
-            case CachedObject::XBL:
+            case CachedResource::XBL:
                 stats.xblDocs.count++;
                 stats.xblDocs.size += o->size();
                 break;
@@ -614,7 +614,7 @@ void Cache::setCacheDisabled(bool disabled)
         flushAll();
 }
 
-CachedObject* Cache::get(const String& s)
+CachedResource* Cache::get(const String& s)
 {
     return (cache && s.impl()) ? cache->get(s.impl()) : 0;
 }
index af260003d67dad915ff21aef9f0dd2b442647193..92e2e85bd2cdd8e9ca1c10a8196b63ee1e154520 100644 (file)
@@ -38,7 +38,7 @@ namespace WebCore  {
 
     class CachedCSSStyleSheet;
     class CachedImage;
-    class CachedObject;
+    class CachedResource;
     class CachedScript;
     class CachedXSLStyleSheet;
     class DocLoader;
@@ -89,10 +89,10 @@ namespace WebCore  {
         static int maxCacheableObjectSize() { return maxCacheable; }
 
         // Get an existing cache entry by URL.
-        static CachedObject* get(const String& URL);
+        static CachedResource* get(const String& URL);
 
         // Remove an existing cache entry.
-        static void remove(CachedObject*);
+        static void remove(CachedResource*);
 
         /**
          * clean up cache
@@ -135,11 +135,11 @@ namespace WebCore  {
         static void flushAll();
         static void setCacheDisabled(bool);
 
-        static void insertInLRUList(CachedObject*);
-        static void removeFromLRUList(CachedObject*);
-        static bool adjustSize(CachedObject*, int sizeDelta);
+        static void insertInLRUList(CachedResource*);
+        static void removeFromLRUList(CachedResource*);
+        static bool adjustSize(CachedResource*, int sizeDelta);
         
-        static LRUList* getLRUListFor(CachedObject*);
+        static LRUList* getLRUListFor(CachedResource*);
         
         static void checkLRUAndUncacheableListIntegrity();
 
@@ -152,13 +152,13 @@ namespace WebCore  {
     
         static Loader* m_loader;
     
-        static void moveToHeadOfLRUList(CachedObject*);
-        static void updateCacheStatus(DocLoader*, CachedObject*);
+        static void moveToHeadOfLRUList(CachedResource*);
+        static void updateCacheStatus(DocLoader*, CachedResource*);
     
         static LRUList* m_LRULists;
         static int m_totalSizeOfLRULists;
             
-        static CachedObject* m_headOfUncacheableList;
+        static CachedResource* m_headOfUncacheableList;
             
         static int m_countOfLRUAndUncacheableLists;
     };
index 4b772e98c015c80bee6fe490090b08144bd73956..8645ee997c88bc03ebe3d171e8809ab4934fd825 100644 (file)
@@ -30,8 +30,8 @@
 #include "CachedCSSStyleSheet.h"
 
 #include "Cache.h"
-#include "CachedObjectClient.h"
-#include "CachedObjectClientWalker.h"
+#include "CachedResourceClient.h"
+#include "CachedResourceClientWalker.h"
 #include "LoaderFunctions.h"
 #include "loader.h"
 #include <wtf/Vector.h>
@@ -39,7 +39,7 @@
 namespace WebCore {
 
 CachedCSSStyleSheet::CachedCSSStyleSheet(DocLoader* dl, const String &url, CachePolicy cachePolicy, time_t _expireDate, const DeprecatedString& charset)
-    : CachedObject(url, CSSStyleSheet, cachePolicy, _expireDate)
+    : CachedResource(url, CSSStyleSheet, cachePolicy, _expireDate)
     , m_encoding(charset.latin1())
 {
     // It's css we want.
@@ -52,7 +52,7 @@ CachedCSSStyleSheet::CachedCSSStyleSheet(DocLoader* dl, const String &url, Cache
 }
 
 CachedCSSStyleSheet::CachedCSSStyleSheet(const String &url, const DeprecatedString &stylesheet_data)
-    : CachedObject(url, CSSStyleSheet, CachePolicyVerify, 0, stylesheet_data.length())
+    : CachedResource(url, CSSStyleSheet, CachePolicyVerify, 0, stylesheet_data.length())
     , m_encoding(InvalidEncoding)
 {
     m_loading = false;
@@ -64,18 +64,18 @@ CachedCSSStyleSheet::~CachedCSSStyleSheet()
 {
 }
 
-void CachedCSSStyleSheet::ref(CachedObjectClient *c)
+void CachedCSSStyleSheet::ref(CachedResourceClient *c)
 {
-    CachedObject::ref(c);
+    CachedResource::ref(c);
 
     if (!m_loading)
         c->setStyleSheet(m_url, m_sheet);
 }
 
-void CachedCSSStyleSheet::deref(CachedObjectClient *c)
+void CachedCSSStyleSheet::deref(CachedResourceClient *c)
 {
     Cache::flush();
-    CachedObject::deref(c);
+    CachedResource::deref(c);
     if ( canDelete() && m_free )
       delete this;
 }
@@ -105,8 +105,8 @@ void CachedCSSStyleSheet::checkNotify()
     if (m_loading)
         return;
 
-    CachedObjectClientWalker w(m_clients);
-    while (CachedObjectClient *c = w.next()) {
+    CachedResourceClientWalker w(m_clients);
+    while (CachedResourceClient *c = w.next()) {
 #if __APPLE__
         if (m_response && !IsResponseURLEqualToURL(m_response, m_url))
             c->setStyleSheet(String(ResponseURL(m_response)), m_sheet);
index 68ef0cb13d74ed4e286250430a8f0addf56fbc2c..4dfdcc4f3d2e296221549e1c4ce945e209cef96d 100644 (file)
@@ -28,7 +28,7 @@
 #ifndef CachedCSSStyleSheet_H
 #define CachedCSSStyleSheet_H
 
-#include "CachedObject.h"
+#include "CachedResource.h"
 #include "TextEncoding.h"
 #include <wtf/Vector.h>
 
@@ -36,7 +36,7 @@ namespace WebCore
 {
     class DocLoader;
 
-    class CachedCSSStyleSheet : public CachedObject
+    class CachedCSSStyleSheet : public CachedResource
     {
     public:
         CachedCSSStyleSheet(DocLoader*, const String& URL, CachePolicy, time_t expireDate, const DeprecatedString& charset);
@@ -45,8 +45,8 @@ namespace WebCore
 
         const String& sheet() const { return m_sheet; }
 
-        virtual void ref(CachedObjectClient*);
-        virtual void deref(CachedObjectClient*);
+        virtual void ref(CachedResourceClient*);
+        virtual void deref(CachedResourceClient*);
 
         virtual void setCharset(const DeprecatedString&);
         virtual void data(Vector<char>&, bool allDataReceived);
index ccbc253773d95689adf06c762943c28be4a15f92..b7529523496d9f185c80180994f2c8b90f36f741 100644 (file)
@@ -30,8 +30,8 @@
 #include "CachedImage.h"
 
 #include "Cache.h"
-#include "CachedObjectClient.h"
-#include "CachedObjectClientWalker.h"
+#include "CachedResourceClient.h"
+#include "CachedResourceClientWalker.h"
 #include "DocLoader.h"
 #include "Image.h"
 #include "LoaderFunctions.h"
@@ -43,7 +43,7 @@ using std::max;
 namespace WebCore {
 
 CachedImage::CachedImage(DocLoader* dl, const String &url, CachePolicy cachePolicy, time_t _expireDate)
-    : CachedObject(url, ImageResource, cachePolicy, _expireDate)
+    : CachedResource(url, ImageResource, cachePolicy, _expireDate)
     , m_dataSize(0)
 {
     m_image = 0;
@@ -57,9 +57,9 @@ CachedImage::~CachedImage()
     clear();
 }
 
-void CachedImage::ref(CachedObjectClient* c)
+void CachedImage::ref(CachedResourceClient* c)
 {
-    CachedObject::ref(c);
+    CachedResource::ref(c);
 
     if (!imageRect().isEmpty())
         c->imageChanged(this);
@@ -68,10 +68,10 @@ void CachedImage::ref(CachedObjectClient* c)
         c->notifyFinished(this);
 }
 
-void CachedImage::deref(CachedObjectClient *c)
+void CachedImage::deref(CachedResourceClient *c)
 {
     Cache::flush();
-    CachedObject::deref(c);
+    CachedResource::deref(c);
     if (canDelete() && m_free)
         delete this;
 }
@@ -99,8 +99,8 @@ IntRect CachedImage::imageRect() const
 
 void CachedImage::notifyObservers()
 {
-    CachedObjectClientWalker w(m_clients);
-    while (CachedObjectClient *c = w.next())
+    CachedResourceClientWalker w(m_clients);
+    while (CachedResourceClient *c = w.next())
         c->imageChanged(this);
 }
 
@@ -189,8 +189,8 @@ void CachedImage::checkNotify()
     if (m_loading)
         return;
 
-    CachedObjectClientWalker w(m_clients);
-    while (CachedObjectClient* c = w.next())
+    CachedResourceClientWalker w(m_clients);
+    while (CachedResourceClient* c = w.next())
         c->notifyFinished(this);
 }
 
@@ -199,8 +199,8 @@ bool CachedImage::shouldStopAnimation(const Image* image)
     if (image != m_image)
         return false;
     
-    CachedObjectClientWalker w(m_clients);
-    while (CachedObjectClient* c = w.next()) {
+    CachedResourceClientWalker w(m_clients);
+    while (CachedResourceClient* c = w.next()) {
         if (c->willRenderImage(this))
             return false;
     }
index b91f0c7e6d44a9618ea352c965ebded5c81748ae..d392bf099221291638f09f35320feea01b30636a 100644 (file)
@@ -28,7 +28,7 @@
 #ifndef KHTML_CachedImage_h
 #define KHTML_CachedImage_h
 
-#include "CachedObject.h"
+#include "CachedResource.h"
 #include "ImageAnimationObserver.h"
 #include "IntRect.h"
 #include <wtf/Vector.h>
@@ -39,7 +39,7 @@ class DocLoader;
 class Cache;
 class Image;
 
-class CachedImage : public CachedObject, public ImageAnimationObserver {
+class CachedImage : public CachedResource, public ImageAnimationObserver {
 public:
     CachedImage(DocLoader*, const String& url, CachePolicy, time_t expireDate);
     virtual ~CachedImage();
@@ -51,8 +51,8 @@ public:
     IntSize imageSize() const;  // returns the size of the complete image
     IntRect imageRect() const;  // The size of the image.
 
-    virtual void ref(CachedObjectClient*);
-    virtual void deref(CachedObjectClient*);
+    virtual void ref(CachedResourceClient*);
+    virtual void deref(CachedResourceClient*);
 
     virtual Vector<char>& bufferData(const char* bytes, int addedSize, Request*);
     virtual void data(Vector<char>&, bool allDataReceived);
similarity index 86%
rename from WebCore/loader/CachedObject.cpp
rename to WebCore/loader/CachedResource.cpp
index 0d87a5e45dde27769630c057115580c7229395e5..45f520ae0723e9af035c4b25c47f005324b95b21 100644 (file)
@@ -27,7 +27,7 @@
 */
 
 #include "config.h"
-#include "CachedObject.h"
+#include "CachedResource.h"
 
 #include "Cache.h"
 #include "Request.h"
@@ -36,7 +36,7 @@
 
 namespace WebCore {
 
-CachedObject::~CachedObject()
+CachedResource::~CachedResource()
 {
     if (m_deleted)
         abort();
@@ -48,7 +48,7 @@ CachedObject::~CachedObject()
 #endif
 }
 
-Vector<char>& CachedObject::bufferData(const char* bytes, int addedSize, Request* request)
+Vector<char>& CachedResource::bufferData(const char* bytes, int addedSize, Request* request)
 {
     // Add new bytes to the buffer in the Request object.
     Vector<char>& buffer = request->buffer();
@@ -60,7 +60,7 @@ Vector<char>& CachedObject::bufferData(const char* bytes, int addedSize, Request
     return buffer;
 }
 
-void CachedObject::finish()
+void CachedResource::finish()
 {
     if (m_size > Cache::maxCacheableObjectSize())
         m_status = Uncacheable;
@@ -71,7 +71,7 @@ void CachedObject::finish()
         m_expireDateChanged = false;
 }
 
-void CachedObject::setExpireDate(time_t expireDate, bool changeHttpCache)
+void CachedResource::setExpireDate(time_t expireDate, bool changeHttpCache)
 {
     if (expireDate == m_expireDate)
         return;
@@ -84,14 +84,14 @@ void CachedObject::setExpireDate(time_t expireDate, bool changeHttpCache)
        m_expireDateChanged = true;
 }
 
-bool CachedObject::isExpired() const
+bool CachedResource::isExpired() const
 {
     if (!m_expireDate) return false;
     time_t now = time(0);
     return (difftime(now, m_expireDate) >= 0);
 }
 
-void CachedObject::setRequest(Request *_request)
+void CachedResource::setRequest(Request *_request)
 {
     if ( _request && !m_request )
         m_status = Pending;
@@ -102,21 +102,21 @@ void CachedObject::setRequest(Request *_request)
         Cache::insertInLRUList(this);
 }
 
-void CachedObject::ref(CachedObjectClient *c)
+void CachedResource::ref(CachedResourceClient *c)
 {
     m_clients.add(c);
     Cache::removeFromLRUList(this);
     increaseAccessCount();
 }
 
-void CachedObject::deref(CachedObjectClient *c)
+void CachedResource::deref(CachedResourceClient *c)
 {
     m_clients.remove(c);
     if (allowInLRUList())
         Cache::insertInLRUList(this);
 }
 
-void CachedObject::setSize(int size)
+void CachedResource::setSize(int size)
 {
     bool sizeChanged = Cache::adjustSize(this, size - m_size);
 
similarity index 90%
rename from WebCore/loader/CachedObject.h
rename to WebCore/loader/CachedResource.h
index 309013b8848e831d54a3697e9cdb3a7f96e231f4..0539e868fa4e88fc4eb6b4a788c359498f46dd33 100644 (file)
@@ -25,8 +25,8 @@
     pages from the web. It has a memory cache for these objects.
 */
 
-#ifndef CachedObject_h
-#define CachedObject_h
+#ifndef CachedResource_h
+#define CachedResource_h
 
 #include "DeprecatedString.h"
 #include "CachePolicy.h"
@@ -45,17 +45,17 @@ class NSURLResponse;
 
 namespace WebCore
 {
-    class CachedObjectClient;
+    class CachedResourceClient;
     class Request;
     
     /**
      *
      * A cached object. Classes who want to use this object should derive
-     * from CachedObjectClient, to get the function calls in case the requested data has arrived.
+     * from CachedResourceClient, to get the function calls in case the requested data has arrived.
      *
      * This class also does the actual communication with kio and loads the file.
      */
-    class CachedObject
+    class CachedResource
     {
     public:
         enum Type {
@@ -80,7 +80,7 @@ namespace WebCore
             Uncacheable   // too big to be cached, will be destroyed as soon as possible
         };
 
-        CachedObject(const String& URL, Type type, CachePolicy cachePolicy, time_t expireDate, int size = 0)
+        CachedResource(const String& URL, Type type, CachePolicy cachePolicy, time_t expireDate, int size = 0)
         {
             m_url = URL;
             m_type = type;
@@ -102,7 +102,7 @@ namespace WebCore
             m_nextInLRUList = 0;
             m_prevInLRUList = 0;
         }
-        virtual ~CachedObject();
+        virtual ~CachedResource();
 
         virtual void setCharset(const DeprecatedString&) { }
         virtual Vector<char>& bufferData(const char* bytes, int addedSize, Request*);
@@ -112,8 +112,8 @@ namespace WebCore
         const String &url() const { return m_url; }
         Type type() const { return m_type; }
 
-        virtual void ref(CachedObjectClient*);
-        virtual void deref(CachedObjectClient*);
+        virtual void ref(CachedResourceClient*);
+        virtual void deref(CachedResourceClient*);
 
         int count() const { return m_clients.size(); }
 
@@ -169,7 +169,7 @@ namespace WebCore
     protected:
         void setSize(int size);
 
-        HashSet<CachedObjectClient*> m_clients;
+        HashSet<CachedResourceClient*> m_clients;
 
         String m_url;
         DeprecatedString m_accept;
@@ -195,8 +195,8 @@ namespace WebCore
     private:
         bool allowInLRUList() const { return canDelete() && status() != Persistent; }
 
-        CachedObject *m_nextInLRUList;
-        CachedObject *m_prevInLRUList;
+        CachedResource *m_nextInLRUList;
+        CachedResource *m_prevInLRUList;
         friend class Cache;
     };
 
similarity index 91%
rename from WebCore/loader/CachedObjectClient.h
rename to WebCore/loader/CachedResourceClient.h
index 9e9ffdf51e0d45be19eaea1e412dc021fe75b95e..752d1b141b6aa49bb7c3f2e28192066aa136ea78 100644 (file)
@@ -24,8 +24,8 @@
     pages from the web. It has a memory cache for these objects.
 */
 
-#ifndef LOADER_CACHED_OBJECT_CLIENT_H
-#define LOADER_CACHED_OBJECT_CLIENT_H
+#ifndef CachedResourceClient_h
+#define CachedResourceClient_h
 
 #ifndef KHTML_NO_XBL
 namespace XBL {
@@ -35,7 +35,7 @@ namespace XBL {
 
 namespace WebCore {
 
-    class CachedObject;
+    class CachedResource;
     class CachedImage;
     class String;
     class Image;
@@ -48,10 +48,10 @@ namespace WebCore {
      * inherit from this class and overload one of the 3 functions
      *
      */
-    class CachedObjectClient
+    class CachedResourceClient
     {
     public:
-        virtual ~CachedObjectClient() { }
+        virtual ~CachedResourceClient() { }
 
         // Called whenever a frame of an image changes, either because we got more data from the network or
         // because we are animating.
@@ -69,7 +69,7 @@ namespace WebCore {
         virtual void setXBLDocument(const String& /*URL*/, XBL::XBLDocument*) { }
 #endif
 
-        virtual void notifyFinished(CachedObject*) { }
+        virtual void notifyFinished(CachedResource*) { }
     };
 
 }
similarity index 83%
rename from WebCore/loader/CachedObjectClientWalker.cpp
rename to WebCore/loader/CachedResourceClientWalker.cpp
index 699f79dbbbe8e448cde6fbe23b7b3705c7d01a98..e4a7fdd6dc8d3512ea6c473785507da6d3cfd8d9 100644 (file)
 */
 
 #include "config.h"
-#include "CachedObjectClientWalker.h"
+#include "CachedResourceClientWalker.h"
 
 namespace WebCore {
 
-CachedObjectClientWalker::CachedObjectClientWalker(const HashSet<CachedObjectClient*>& set)
+CachedResourceClientWalker::CachedResourceClientWalker(const HashSet<CachedResourceClient*>& set)
     : m_clientSet(set), m_clientVector(set.size()), m_index(0)
 {
-    typedef HashSet<CachedObjectClient*>::const_iterator Iterator;
+    typedef HashSet<CachedResourceClient*>::const_iterator Iterator;
     Iterator end = set.end();
     size_t clientIndex = 0;
     for (Iterator current = set.begin(); current != end; ++current)
         m_clientVector[clientIndex++] = *current;
 }
 
-CachedObjectClient* CachedObjectClientWalker::next()
+CachedResourceClient* CachedResourceClientWalker::next()
 {
     size_t size = m_clientVector.size();
     while (m_index < size) {
-        CachedObjectClient* next = m_clientVector[m_index++];
+        CachedResourceClient* next = m_clientVector[m_index++];
         if (m_clientSet.contains(next))
             return next;
     }
similarity index 79%
rename from WebCore/loader/CachedObjectClientWalker.h
rename to WebCore/loader/CachedResourceClientWalker.h
index 7570f150817345dbdfbd4179609b653a762bd2bb..a5fded899ab0624494b5bd62201dcaedc8322b30 100644 (file)
     pages from the web. It has a memory cache for these objects.
 */
 
-#ifndef CachedObjectClientWalker_h
-#define CachedObjectClientWalker_h
+#ifndef CachedResourceClientWalker_h
+#define CachedResourceClientWalker_h
 
 #include <wtf/HashSet.h>
 #include <wtf/Vector.h>
 
 namespace WebCore {
 
-    class CachedObjectClient;
+    class CachedResourceClient;
 
     // Call this "walker" instead of iterator so people won't expect Qt or STL-style iterator interface.
     // Just keep calling next() on this. It's safe from deletions of items.
-    class CachedObjectClientWalker {
+    class CachedResourceClientWalker {
     public:
-        CachedObjectClientWalker(const HashSet<CachedObjectClient*>&);
-        CachedObjectClient* next();
+        CachedResourceClientWalker(const HashSet<CachedResourceClient*>&);
+        CachedResourceClient* next();
     private:
-        const HashSet<CachedObjectClient*>& m_clientSet;
-        Vector<CachedObjectClient*> m_clientVector;
+        const HashSet<CachedResourceClient*>& m_clientSet;
+        Vector<CachedResourceClient*> m_clientVector;
         size_t m_index;
     };
 
index c071a89ef47e2a308fb9b7fb33f250ba3d73a296..20237f5caf408b86b2810b939746cc6313a4acc0 100644 (file)
 #include "CachedScript.h"
 
 #include "Cache.h"
-#include "CachedObjectClient.h"
-#include "CachedObjectClientWalker.h"
+#include "CachedResourceClient.h"
+#include "CachedResourceClientWalker.h"
 #include "loader.h"
 #include <wtf/Vector.h>
 
 namespace WebCore {
 
 CachedScript::CachedScript(DocLoader* dl, const String &url, CachePolicy cachePolicy, time_t _expireDate, const DeprecatedString& charset)
-    : CachedObject(url, Script, cachePolicy, _expireDate)
+    : CachedResource(url, Script, cachePolicy, _expireDate)
     , m_encoding(charset.latin1())
 {
     // It's javascript we want.
@@ -54,7 +54,7 @@ CachedScript::CachedScript(DocLoader* dl, const String &url, CachePolicy cachePo
 }
 
 CachedScript::CachedScript(const String &url, const DeprecatedString &script_data)
-    : CachedObject(url, Script, CachePolicyVerify, 0, script_data.length())
+    : CachedResource(url, Script, CachePolicyVerify, 0, script_data.length())
     , m_encoding(InvalidEncoding)
 {
     m_errorOccurred = false;
@@ -67,17 +67,17 @@ CachedScript::~CachedScript()
 {
 }
 
-void CachedScript::ref(CachedObjectClient *c)
+void CachedScript::ref(CachedResourceClient *c)
 {
-    CachedObject::ref(c);
+    CachedResource::ref(c);
 
     if(!m_loading) c->notifyFinished(this);
 }
 
-void CachedScript::deref(CachedObjectClient *c)
+void CachedScript::deref(CachedResourceClient *c)
 {
     Cache::flush();
-    CachedObject::deref(c);
+    CachedResource::deref(c);
     if ( canDelete() && m_free )
       delete this;
 }
@@ -105,8 +105,8 @@ void CachedScript::checkNotify()
     if (m_loading)
         return;
 
-    CachedObjectClientWalker w(m_clients);
-    while (CachedObjectClient *c = w.next())
+    CachedResourceClientWalker w(m_clients);
+    while (CachedResourceClient *c = w.next())
         c->notifyFinished(this);
 }
 
index ec0483eb6621c68c2c48f9f11b33950afdd89bb1..e360759e97ed25e23571548276dcf51d0f04f004 100644 (file)
 #ifndef CachedScript_h
 #define CachedScript_h
 
-#include "CachedObject.h"
+#include "CachedResource.h"
 #include "TextEncoding.h"
 #include <wtf/Vector.h>
 
 namespace WebCore {
     class DocLoader;
 
-    class CachedScript : public CachedObject {
+    class CachedScript : public CachedResource {
     public:
         CachedScript(DocLoader*, const String& URL, CachePolicy, time_t expireDate, const DeprecatedString& charset);
         CachedScript(const String& URL, const DeprecatedString& scriptData);
@@ -43,8 +43,8 @@ namespace WebCore {
 
         const String& script() const { return m_script; }
 
-        virtual void ref(CachedObjectClient*);
-        virtual void deref(CachedObjectClient*);
+        virtual void ref(CachedResourceClient*);
+        virtual void deref(CachedResourceClient*);
 
         virtual void setCharset(const DeprecatedString&);
         virtual void data(Vector<char>&, bool allDataReceived);
index e0ecc456c1ab7462a57d99c5f06f2e05ada053aa..4c18d0f3d8b591494a4f1669eb7d6c6ffbc90710 100644 (file)
@@ -33,7 +33,7 @@
 #include "CachedXBLDocument.h"
 
 #include "Cache.h"
-#include "CachedObjectClientWalker.h"
+#include "CachedResourceClientWalker.h"
 #include "Decoder.h"
 #include "loader.h"
 #include <wtf/Vector.h>
@@ -41,7 +41,7 @@
 namespace WebCore {
 
 CachedXBLDocument::CachedXBLDocument(DocLoader* dl, const String &url, CachePolicy cachePolicy, time_t _expireDate)
-: CachedObject(url, XBL, cachePolicy, _expireDate), m_document(0)
+: CachedResource(url, XBL, cachePolicy, _expireDate), m_document(0)
 {
     // It's XML we want.
     setAccept("text/xml, application/xml, application/xhtml+xml, text/xsl, application/rss+xml, application/atom+xml");
@@ -58,17 +58,17 @@ CachedXBLDocument::~CachedXBLDocument()
         m_document->deref();
 }
 
-void CachedXBLDocument::ref(CachedObjectClient *c)
+void CachedXBLDocument::ref(CachedResourceClient *c)
 {
-    CachedObject::ref(c);
+    CachedResource::ref(c);
     if (!m_loading)
         c->setXBLDocument(m_url, m_document);
 }
 
-void CachedXBLDocument::deref(CachedObjectClient *c)
+void CachedXBLDocument::deref(CachedResourceClient *c)
 {
     Cache::flush();
-    CachedObject::deref(c);
+    CachedResource::deref(c);
     if (canDelete() && m_free)
         delete this;
 }
@@ -104,8 +104,8 @@ void CachedXBLDocument::checkNotify()
     if (m_loading)
         return;
     
-    CachedObjectClientWalker w(m_clients);
-    while (CachedObjectClient *c = w.next())
+    CachedResourceClientWalker w(m_clients);
+    while (CachedResourceClient *c = w.next())
         c->setXBLDocument(m_url, m_document);
 }
 
index 6655932cb08b58761bfa03fb01f82efb8a7309a2..b519086055d02e53d1e78565c11ed378bc180cda 100644 (file)
 #ifndef CachedXBLDocument_h
 #define CachedXBLDocument_h
 
-#include "CachedObject.h"
+#include "CachedResource.h"
 #include <wtf/Vector.h>
 
 namespace WebCore {
-    class CachedObject;
+    class CachedResource;
     class Request;
     class DocLoader;
     class Decoder;
-    class CachedObjectClient;
+    class CachedResourceClient;
     
 #ifndef KHTML_NO_XBL
-    class CachedXBLDocument : public CachedObject
+    class CachedXBLDocument : public CachedResource
     {
     public:
         CachedXBLDocument(DocLoader*, const String& url, CachePolicy, time_t expireDate);
@@ -47,8 +47,8 @@ namespace WebCore {
         
         XBL::XBLDocument* document() const { return m_document; }
         
-        virtual void ref(CachedObjectClient*);
-        virtual void deref(CachedObjectClient*);
+        virtual void ref(CachedResourceClient*);
+        virtual void deref(CachedResourceClient*);
         
         virtual void setCharset(const DeprecatedString&);
         virtual void data(Vector<char>&, bool allDataReceived);
index 6b740fd07989cb9618505ec89a6b0fe16b79d095..a0f9b99034e5ad432c522ceca396981df331b761 100644 (file)
@@ -30,8 +30,8 @@
 #include "CachedXSLStyleSheet.h"
 
 #include "Cache.h"
-#include "CachedObjectClient.h"
-#include "CachedObjectClientWalker.h"
+#include "CachedResourceClient.h"
+#include "CachedResourceClientWalker.h"
 #include "Decoder.h"
 #include "loader.h"
 #include <wtf/Vector.h>
@@ -41,7 +41,7 @@ namespace WebCore {
 #ifdef KHTML_XSLT
 
 CachedXSLStyleSheet::CachedXSLStyleSheet(DocLoader* dl, const String &url, CachePolicy cachePolicy, time_t _expireDate)
-    : CachedObject(url, XSLStyleSheet, cachePolicy, _expireDate)
+    : CachedResource(url, XSLStyleSheet, cachePolicy, _expireDate)
 {
     // It's XML we want.
     // FIXME: This should accept more general xml formats */*+xml, image/svg+xml for example.
@@ -53,18 +53,18 @@ CachedXSLStyleSheet::CachedXSLStyleSheet(DocLoader* dl, const String &url, Cache
     m_decoder = new Decoder;
 }
 
-void CachedXSLStyleSheet::ref(CachedObjectClient *c)
+void CachedXSLStyleSheet::ref(CachedResourceClient *c)
 {
-    CachedObject::ref(c);
+    CachedResource::ref(c);
     
     if (!m_loading)
         c->setStyleSheet(m_url, m_sheet);
 }
 
-void CachedXSLStyleSheet::deref(CachedObjectClient *c)
+void CachedXSLStyleSheet::deref(CachedResourceClient *c)
 {
     Cache::flush();
-    CachedObject::deref(c);
+    CachedResource::deref(c);
     if (canDelete() && m_free)
         delete this;
 }
@@ -91,8 +91,8 @@ void CachedXSLStyleSheet::checkNotify()
     if (m_loading)
         return;
     
-    CachedObjectClientWalker w(m_clients);
-    while (CachedObjectClient *c = w.next())
+    CachedResourceClientWalker w(m_clients);
+    while (CachedResourceClient *c = w.next())
         c->setStyleSheet(m_url, m_sheet);
 }
 
index 9e5435ea4d9bd0cba1ca431836c58cc83d3877f8..b6ae67b790488e02365a46822414d12e093ddd13 100644 (file)
@@ -28,7 +28,7 @@
 #ifndef KHTML_CachedXSLStyleSheet_h
 #define KHTML_CachedXSLStyleSheet_h
 
-#include "CachedObject.h"
+#include "CachedResource.h"
 #include <wtf/Vector.h>
 
 namespace WebCore {
@@ -37,14 +37,14 @@ namespace WebCore {
     class Decoder;
 
 #ifdef KHTML_XSLT
-    class CachedXSLStyleSheet : public CachedObject {
+    class CachedXSLStyleSheet : public CachedResource {
     public:
         CachedXSLStyleSheet(DocLoader*, const String& url, CachePolicy, time_t expireDate);
 
         const String& sheet() const { return m_sheet; }
         
-        virtual void ref(CachedObjectClient*);
-        virtual void deref(CachedObjectClient*);
+        virtual void ref(CachedResourceClient*);
+        virtual void deref(CachedResourceClient*);
         
         virtual void setCharset(const DeprecatedString&);
         virtual void data(Vector<char>&, bool allDataReceived);
index a967389581d9d2901598400aa83ab4bb2ea0802e..2036e67e8cb57dfc42c0c792b07d611de10f02b3 100644 (file)
@@ -68,7 +68,7 @@ bool DocLoader::needReload(const KURL& fullURL)
     bool reload = false;
     if (m_cachePolicy == CachePolicyVerify) {
        if (!m_reloadedURLs.contains(fullURL.url())) {
-          CachedObject* existing = Cache::get(fullURL.url());
+          CachedResource* existing = Cache::get(fullURL.url());
           if (existing && existing->isExpired()) {
              Cache::remove(existing);
              m_reloadedURLs.append(fullURL.url());
@@ -77,7 +77,7 @@ bool DocLoader::needReload(const KURL& fullURL)
        }
     } else if ((m_cachePolicy == CachePolicyReload) || (m_cachePolicy == CachePolicyRefresh)) {
        if (!m_reloadedURLs.contains(fullURL.url())) {
-          CachedObject* existing = Cache::get(fullURL.url());
+          CachedResource* existing = Cache::get(fullURL.url());
           if (existing)
              Cache::remove(existing);
           m_reloadedURLs.append(fullURL.url());
@@ -174,14 +174,14 @@ void DocLoader::setAutoloadImages(bool enable)
     if (!m_bautoloadImages)
         return;
 
-    HashMap<String, CachedObject*>::iterator end = m_docObjects.end();
-    for (HashMap<String, CachedObject*>::iterator it = m_docObjects.begin(); it != end; ++it) {
-        CachedObject* co = it->second;
-        if (co->type() == CachedObject::ImageResource) {
+    HashMap<String, CachedResource*>::iterator end = m_docObjects.end();
+    for (HashMap<String, CachedResource*>::iterator it = m_docObjects.begin(); it != end; ++it) {
+        CachedResource* co = it->second;
+        if (co->type() == CachedResource::ImageResource) {
             CachedImage *img = const_cast<CachedImage*>(static_cast<const CachedImage *>(co));
 
-            CachedObject::Status status = img->status();
-            if (status != CachedObject::Unknown)
+            CachedResource::Status status = img->status();
+            if (status != CachedResource::Unknown)
                 continue;
 
             Cache::loader()->load(this, img, true);
@@ -194,7 +194,7 @@ void DocLoader::setCachePolicy(CachePolicy cachePolicy)
     m_cachePolicy = cachePolicy;
 }
 
-void DocLoader::removeCachedObject(CachedObject* o) const
+void DocLoader::removeCachedObject(CachedResource* o) const
 {
     m_docObjects.remove(o->url());
 }
index 853e811d1b336983a2ae66ecc7ffbbd3574d3777..bcd5f97dad53b0258d5fe63baedece731b445cd2 100644 (file)
@@ -40,7 +40,7 @@ class LoaderFunctions;
 namespace WebCore {
     class CachedCSSStyleSheet;
     class CachedImage;
-    class CachedObject;
+    class CachedResource;
     class CachedScript;
     class CachedXSLStyleSheet;
     class Document;
@@ -67,8 +67,8 @@ namespace WebCore {
         CachedXBLDocument* requestXBLDocument(const String &url);
 #endif
 
-        CachedObject* cachedObject(const String& url) const { return m_docObjects.get(url); }
-        const HashMap<String, CachedObject*>& allCachedObjects() const { return m_docObjects; }
+        CachedResource* cachedObject(const String& url) const { return m_docObjects.get(url); }
+        const HashMap<String, CachedResource*>& allCachedObjects() const { return m_docObjects; }
 
         bool autoloadImages() const { return m_bautoloadImages; }
         CachePolicy cachePolicy() const { return m_cachePolicy; }
@@ -79,7 +79,7 @@ namespace WebCore {
         void setExpireDate(time_t);
         void setAutoloadImages(bool);
         void setCachePolicy(CachePolicy);
-        void removeCachedObject(CachedObject*) const;
+        void removeCachedObject(CachedResource*) const;
 
         void setLoadInProgress(bool);
         bool loadInProgress() const { return m_loadInProgress; }
@@ -92,7 +92,7 @@ namespace WebCore {
         friend class WebCore::HTMLImageLoader;
 
         DeprecatedStringList m_reloadedURLs;
-        mutable HashMap<String, CachedObject*> m_docObjects;
+        mutable HashMap<String, CachedResource*> m_docObjects;
         time_t m_expireDate;
         CachePolicy m_cachePolicy;
         bool m_bautoloadImages : 1;
index f8991f1a4e46db725ff03b337852fe9f51e9aae5..8eee7af6121dd60ae33798bf404be4fc08af4e0f 100644 (file)
@@ -44,7 +44,7 @@ class KURL;
 class DeprecatedString;
 
 namespace WebCore {
-    class CachedObject;
+    class CachedResource;
     class DocLoader;
     class TransferJob;
     class Loader;
@@ -54,7 +54,7 @@ namespace WebCore {
 
 Vector<char> ServeSynchronousRequest(WebCore::Loader*, WebCore::DocLoader*, WebCore::TransferJob*, KURL& finalURL, DeprecatedString& headers);
 
-void CheckCacheObjectStatus(WebCore::DocLoader*, WebCore::CachedObject*);
+void CheckCacheObjectStatus(WebCore::DocLoader*, WebCore::CachedResource*);
 bool CheckIfReloading(WebCore::DocLoader*);
 bool IsResponseURLEqualToURL(NSURLResponse*, const WebCore::String& m_url);
 DeprecatedString ResponseURL(NSURLResponse *response);
index ab15bb8bb3b6813fd2a665028d22d04615c62995..8176f7591fdd966a92e34f11b5179008e6341c08 100644 (file)
 #include "config.h"
 #include "Request.h"
 
-#include "CachedObject.h"
+#include "CachedResource.h"
 
 namespace WebCore {
 
-Request::Request(DocLoader* docLoader, CachedObject* object, bool incremental)
+Request::Request(DocLoader* docLoader, CachedResource* object, bool incremental)
     : m_object(object)
     , m_docLoader(docLoader)
     , m_incremental(incremental)
index 46cfb9c6f003624f3002fe3d95e1ba72089e5c68..4eea32e9eadf42f7febc4b1a887d85f1fe8d42fc 100644 (file)
 
 namespace WebCore {
 
-    class CachedObject;
+    class CachedResource;
     class DocLoader;
 
     class Request {
     public:
-        Request(DocLoader*, CachedObject*, bool incremental);
+        Request(DocLoader*, CachedResource*, bool incremental);
         ~Request();
         
         Vector<char>& buffer() { return m_buffer; }
-        CachedObject* cachedObject() { return m_object; }
+        CachedResource* cachedObject() { return m_object; }
         DocLoader* docLoader() { return m_docLoader; }
 
         bool isIncremental() { return m_incremental; }
@@ -52,7 +52,7 @@ namespace WebCore {
 
     private:
         Vector<char> m_buffer;
-        CachedObject* m_object;
+        CachedResource* m_object;
         DocLoader* m_docLoader;
         bool m_incremental;
         bool m_multipart;
index 3a279dd379239d31ebda5b8497643c7cbba71e6c..9edcb39fa2054da649ef361a34b8043a40306fb7 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "Cache.h"
 #include "CachedImage.h"
-#include "CachedObject.h"
+#include "CachedResource.h"
 #include "DocLoader.h"
 #include "Frame.h"
 #include "HTMLDocument.h"
@@ -79,7 +79,7 @@ Loader::~Loader()
     deleteAllValues(m_requestsLoading);
 }
 
-void Loader::load(DocLoader* dl, CachedObject* object, bool incremental)
+void Loader::load(DocLoader* dl, CachedResource* object, bool incremental)
 {
     Request* req = new Request(dl, object, incremental);
     m_requestsPending.append(req);
@@ -124,7 +124,7 @@ void Loader::receivedAllData(TransferJob* job, PlatformData allData)
     Request* req = i->second;
     m_requestsLoading.remove(i);
 
-    CachedObject* object = req->cachedObject();
+    CachedResource* object = req->cachedObject();
     DocLoader* docLoader = req->docLoader();
 
     if (job->error() || job->isErrorPage()) {
@@ -179,7 +179,7 @@ void Loader::receivedData(TransferJob* job, const char* data, int size)
     if (!request)
         return;
 
-    CachedObject* object = request->cachedObject();    
+    CachedResource* object = request->cachedObject();    
     Vector<char>& buffer = object->bufferData(data, size, request);
 
     // Set the data.
@@ -267,7 +267,7 @@ TransferJob* Loader::jobForRequest(const String& URL) const
 {
     RequestMap::const_iterator end = m_requestsLoading.end();
     for (RequestMap::const_iterator i = m_requestsLoading.begin(); i != end; ++i) {
-        CachedObject* obj = i->second->cachedObject();
+        CachedResource* obj = i->second->cachedObject();
         if (obj && obj->url() == URL)
             return i->first;
     }
index 4abae8def47e11d681c844aa95ae86aa0f82a7ba..e63c318f4c3113f887a0d6b651111fa4daf01e21 100644 (file)
@@ -41,7 +41,7 @@ class NSURLResponse;
 
 namespace WebCore {
 
-    class CachedObject;
+    class CachedResource;
     class DocLoader;
     class Request;
     class String;
@@ -52,7 +52,7 @@ namespace WebCore {
         Loader();
         ~Loader();
 
-        void load(DocLoader*, CachedObject*, bool incremental = true);
+        void load(DocLoader*, CachedResource*, bool incremental = true);
 
         int numRequests(DocLoader*) const;
         void cancelRequests(DocLoader*);
index 228b727ded887b2e1c58f06b00c1ef095b54b763..3a8f88deb0e14da25725abf5497b632819cb1ede 100644 (file)
@@ -179,20 +179,20 @@ bool CheckIfReloading(DocLoader *loader)
     return false;
 }
 
-void CheckCacheObjectStatus(DocLoader *loader, CachedObject *cachedObject)
+void CheckCacheObjectStatus(DocLoader *loader, CachedResource *cachedObject)
 {
     // Return from the function for objects that we didn't load from the cache.
     if (!cachedObject)
         return;
     switch (cachedObject->status()) {
-    case CachedObject::Persistent:
-    case CachedObject::Cached:
-    case CachedObject::Uncacheable:
+    case CachedResource::Persistent:
+    case CachedResource::Cached:
+    case CachedResource::Uncacheable:
         break;
-    case CachedObject::NotCached:
-    case CachedObject::Unknown:
-    case CachedObject::New:
-    case CachedObject::Pending:
+    case CachedResource::NotCached:
+    case CachedResource::Unknown:
+    case CachedResource::New:
+    case CachedResource::Pending:
         return;
     }
     
@@ -279,7 +279,7 @@ time_t CacheObjectExpiresTime(WebCore::DocLoader *docLoader, NSURLResponse *resp
 
 namespace WebCore {
     
-void CachedObject::setResponse(NSURLResponse *response)
+void CachedResource::setResponse(NSURLResponse *response)
 {
     HardRetain(response);
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
@@ -289,7 +289,7 @@ void CachedObject::setResponse(NSURLResponse *response)
     m_response = response;
 }
 
-void CachedObject::setAllData(NSData *allData)
+void CachedResource::setAllData(NSData *allData)
 {
     HardRetain(allData);
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
index 0abb0bfbf9ae9cce4e8a6f042b327835e1e64b2c..48feba3267d038668d95776578ef3a4861fe9728 100644 (file)
@@ -109,7 +109,7 @@ using namespace HTMLNames;
 const double caretBlinkFrequency = 0.5;
 const double autoscrollInterval = 0.1;
 
-class UserStyleSheetLoader : public CachedObjectClient {
+class UserStyleSheetLoader : public CachedResourceClient {
 public:
     UserStyleSheetLoader(Frame* frame, const String& url, DocLoader* dl)
         : m_frame(frame)
index fd1fe3b73a4b00435c6f3d5aa750c11389a9b927..930ec6453435d6e41e4b58fbed50b5ec18d0aeec 100644 (file)
@@ -25,7 +25,7 @@
 #include "config.h"
 #include "FrameView.h"
 
-#include "AccessibilityObjectCache.h"
+#include "AXObjectCache.h"
 #include "CachedImage.h"
 #include "Cursor.h"
 #include "EventNames.h"
@@ -500,8 +500,8 @@ void FrameView::layout(bool allowSubtree)
     d->layoutCount++;
 
 #if __APPLE__
-    if (AccessibilityObjectCache::accessibilityEnabled())
-        root->document()->getAccObjectCache()->postNotification(root, "AXLayoutComplete");
+    if (AXObjectCache::accessibilityEnabled())
+        root->document()->axObjectCache()->postNotification(root, "AXLayoutComplete");
     updateDashboardRegions();
 #endif
 
index f41caef884c0eff0efdfdcaf41adfa21b3e2ac56..294a8543a89146d0603e3bfe152de96fdfe8bee2 100644 (file)
@@ -62,7 +62,7 @@
 #include "TransferJob.h"
 #include "RenderThemeGdk.h"
 #include "TextBoundaries.h"
-#include "AccessibilityObjectCache.h"
+#include "AXObjectCache.h"
 
 using namespace WebCore;
 
@@ -218,7 +218,7 @@ bool WebCore::screenIsMonochrome(Widget*) { notImplemented(); return false; }
 static Cursor localCursor;
 const Cursor& WebCore::moveCursor() { return localCursor; }
 
-bool AccessibilityObjectCache::gAccessibilityEnabled = false;
+bool AXObjectCache::gAccessibilityEnabled = false;
 
 bool WebCore::historyContains(DeprecatedString const&) { return false; }
 String WebCore::submitButtonDefaultLabel() { return "Submit"; }
@@ -261,7 +261,7 @@ void BrowserExtensionGdk::setIconURL(KURL const&) { }
 int BrowserExtensionGdk::getHistoryLength() { return 0; }
 
 bool CheckIfReloading(WebCore::DocLoader*) { return false; }
-void CheckCacheObjectStatus(DocLoader*, CachedObject*) { }
+void CheckCacheObjectStatus(DocLoader*, CachedResource*) { }
 
 void Widget::setEnabled(bool) { }
 void Widget::paint(GraphicsContext*, IntRect const&) { }
index acb0464afae951a0782928ffa97fb98c9eae9437..c5cfb9703ea1f28ebb09042f0f476371ec230bfe 100644 (file)
@@ -31,7 +31,7 @@
 #include "Image.h"
 #include "IntPoint.h"
 #include "Clipboard.h"
-#include "CachedObjectClient.h"
+#include "CachedResourceClient.h"
 
 #ifdef __OBJC__
 @class NSImage;
@@ -48,7 +48,7 @@ namespace WebCore {
 
 class FrameMac;
 
-class ClipboardMac : public Clipboard, public CachedObjectClient {
+class ClipboardMac : public Clipboard, public CachedResourceClient {
 public:
     // security mechanisms
     typedef enum {
diff --git a/WebCore/platform/mac/can-convert.mm b/WebCore/platform/mac/can-convert.mm
deleted file mode 100644 (file)
index 69a1872..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/* cd into the kwq directory, and use this command:
-
-make && g++ can-convert.mm -framework Carbon && ./a.out && rm a.out
-
-*/
-
-#include "config.h"
-#include <Carbon/Carbon.h>
-
-const int NoEncodingFlags = 0;
-const int BigEndian = 0;
-const int IsJapanese = 0;
-const int LittleEndian = 0;
-const int VisualOrdering = 0;
-
-typedef struct {
-    const char *charset;
-    TextEncoding encoding;
-    int flags;
-} CharsetEntry;
-
-#define kCFStringEncodingBig5_DOSVariant (kTextEncodingBig5 | (kBig5_DOSVariant << 16))
-#define kCFStringEncodingEUC_CN_DOSVariant (kTextEncodingEUC_CN | (kEUC_CN_DOSVariant << 16))
-#define kCFStringEncodingEUC_KR_DOSVariant (kTextEncodingEUC_KR | (kEUC_KR_DOSVariant << 16))
-#define kCFStringEncodingISOLatin10 kTextEncodingISOLatin10
-#define kCFStringEncodingKOI8_U kTextEncodingKOI8_U
-#define kCFStringEncodingShiftJIS_DOSVariant (kTextEncodingShiftJIS | (kShiftJIS_DOSVariant << 16))
-
-#include "KWQCharsetData.c"
-
-int main()
-{
-    int i;
-    for (i = 0; table[i].charset; ++i) {
-        TECObjectRef c;
-        if (table[i].encoding != kCFStringEncodingUnicode
-            && TECCreateConverter(&c, table[i].encoding,
-                CreateTextEncoding(kTextEncodingUnicodeDefault, kTextEncodingDefaultVariant, kUnicode16BitFormat)) != noErr) {
-            printf("can't do %s\n", table[i].charset);
-        }
-    }
-}
index db09bcb298d89902e53dfb484ce7c082d60dbde5..d6c1a70316c66758fbae12c33059d7c2a1fe082f 100644 (file)
@@ -60,7 +60,7 @@
 #include "TransferJob.h"
 #include "RenderThemeWin.h"
 #include "TextBoundaries.h"
-#include "AccessibilityObjectCache.h"
+#include "AXObjectCache.h"
 #include "RenderPopupMenuWin.h"
 
 using namespace WebCore;
@@ -220,7 +220,7 @@ bool WebCore::screenIsMonochrome(Widget*) { notImplemented(); return false; }
 static Cursor localCursor;
 const Cursor& WebCore::moveCursor() { return localCursor; }
 
-bool AccessibilityObjectCache::gAccessibilityEnabled = false;
+bool AXObjectCache::gAccessibilityEnabled = false;
 
 bool WebCore::historyContains(DeprecatedString const&) { return false; }
 String WebCore::submitButtonDefaultLabel() { return "Submit"; }
@@ -264,7 +264,7 @@ void BrowserExtensionWin::setIconURL(KURL const&) { }
 int BrowserExtensionWin::getHistoryLength() { return 0; }
 
 bool CheckIfReloading(WebCore::DocLoader*) { return false; }
-void CheckCacheObjectStatus(DocLoader*, CachedObject*) { }
+void CheckCacheObjectStatus(DocLoader*, CachedResource*) { }
 
 void Widget::setEnabled(bool) { }
 void Widget::paint(GraphicsContext*,IntRect const&) { }
index 158789f9f955629b50826165f45f8af01caf5348..5994ecb753a210e885a690121f9d823551574453 100644 (file)
@@ -29,7 +29,7 @@
 #include "RenderLayer.h"
 
 namespace WebCore {
-    class CachedObject;
+    class CachedResource;
     
     enum WidthType { Width, MinWidth, MaxWidth };
     
index c7035010e0b9abcfcd4caf0c433e1aed3904edcf..87038a787f529dcd13f1ec56ceb62aab5a7320a5 100644 (file)
@@ -36,7 +36,7 @@
 #include "Document.h"
 
 // For accessibility
-#include "AccessibilityObjectCache.h" 
+#include "AXObjectCache.h" 
 
 namespace WebCore {
 
@@ -203,8 +203,8 @@ RenderObject* RenderContainer::removeChildNode(RenderObject* oldChild)
     oldChild->setNextSibling(0);
     oldChild->setParent(0);
 
-    if (AccessibilityObjectCache::accessibilityEnabled())
-        document()->getAccObjectCache()->childrenChanged(this);
+    if (AXObjectCache::accessibilityEnabled())
+        document()->axObjectCache()->childrenChanged(this);
 
     return oldChild;
 }
@@ -381,8 +381,8 @@ void RenderContainer::appendChildNode(RenderObject* newChild)
     if (!newChild->isFloatingOrPositioned() && childrenInline())
         dirtyLinesFromChangedChild(newChild);
     
-    if (AccessibilityObjectCache::accessibilityEnabled())
-        document()->getAccObjectCache()->childrenChanged(this);
+    if (AXObjectCache::accessibilityEnabled())
+        document()->axObjectCache()->childrenChanged(this);
 }
 
 void RenderContainer::insertChildNode(RenderObject* child, RenderObject* beforeChild)
@@ -421,8 +421,8 @@ void RenderContainer::insertChildNode(RenderObject* child, RenderObject* beforeC
     if (!child->isFloating() && childrenInline())
         dirtyLinesFromChangedChild(child);
     
-    if (AccessibilityObjectCache::accessibilityEnabled())
-        document()->getAccObjectCache()->childrenChanged(this);
+    if (AXObjectCache::accessibilityEnabled())
+        document()->axObjectCache()->childrenChanged(this);
 }
 
 void RenderContainer::layout()
index bb6e62af4d7470c21aeba93d79ed8804fe0b8fb1..db04689a1279ce91e31b667348010c64ff3cf1b0 100644 (file)
@@ -65,7 +65,7 @@ void RenderImage::setStyle(RenderStyle* _style)
     setShouldPaintBackgroundOrBorder(true);
 }
 
-void RenderImage::setContentObject(CachedObject* co)
+void RenderImage::setContentObject(CachedResource* co)
 {
     if (co && m_cachedImage != co) {
         if (m_cachedImage)
index c1dc64e6d736c57dba1475a75acefa8d1d41bb56..fcdc24e88836dbace708475fce4f3b4e0e9297ff 100644 (file)
@@ -77,7 +77,7 @@ public:
     virtual void calcMinMaxWidth();
 
     // Called to set generated content images (e.g., :before/:after generated images).
-    void setContentObject(CachedObject*);
+    void setContentObject(CachedResource*);
     
     bool errorOccurred() const { return m_cachedImage && m_cachedImage->isErrorImage(); }
     
index 6a5db1e4280f59bb951f535a5a06ee6a16dbcebe..0579f00710431dff46ea33d22b1ec10b1de81dc5 100644 (file)
@@ -52,7 +52,7 @@ class ScrollBar;
 
 namespace WebCore {
 
-class CachedObject;
+class CachedResource;
 class RenderView;
 class RenderFrameSet;
 class RenderObject;
index 6ed600f08b1c6c55a9d458c1bdbef7d5ab4924c0..6c212e2032648695810b31c8f22cfd4ee52b3628 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "RenderObject.h"
 
-#include "AccessibilityObjectCache.h" 
+#include "AXObjectCache.h" 
 #include "CachedImage.h"
 #include "Decoder.h"
 #include "Document.h"
@@ -140,7 +140,7 @@ static RenderObjectCounter renderObjectCounter;
 #endif
 
 RenderObject::RenderObject(Node* node)
-    : CachedObjectClient(),
+    : CachedResourceClient(),
 m_style( 0 ),
 m_node( node ),
 m_parent( 0 ),
@@ -2343,7 +2343,7 @@ RenderArena* RenderObject::renderArena() const
 
 void RenderObject::remove()
 {
-    document()->getAccObjectCache()->remove(this);
+    document()->axObjectCache()->remove(this);
 
     removeFromObjectLists();
 
@@ -2822,7 +2822,7 @@ void RenderObject::imageChanged(CachedImage *image)
     // This is needed for RenderBox objects, and also for table objects that hold
     // backgrounds that are then respected by the table cells (which are RenderBox
     // subclasses). It would be even better to find a more elegant way of doing this that
-    // would avoid putting this function and the CachedObjectClient base class into RenderObject.
+    // would avoid putting this function and the CachedResourceClient base class into RenderObject.
     if (image && image->canRender() && parent()) {
         if (view() && element() && (element()->hasTagName(htmlTag) || element()->hasTagName(bodyTag)))
             view()->repaint();    // repaint the entire canvas since the background gets propagated up
index ccfa3e0c5098c95603784960fa619a199f74b714..cd24bf28eb8c66d4a54c97de910d96946dc538d1 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef RenderObject_h
 #define RenderObject_h
 
-#include "CachedObjectClient.h"
+#include "CachedResourceClient.h"
 #include "RenderStyle.h"
 #include "ScrollBar.h"
 #include "VisiblePosition.h"
@@ -114,7 +114,7 @@ typedef HashSet<RenderFlow*> RenderFlowSequencedSet;
 /**
  * Base Class for all rendering tree objects.
  */
-class RenderObject : public CachedObjectClient
+class RenderObject : public CachedResourceClient
 {
 public:
     // Anonymous objects should pass the document as their node, and they will then automatically be
index b5b1b6d0bf8ff66d2952b6f60075d3dd324fd263..179b70946a2c34e471ec4c96bc7c8c69fc75bae1 100644 (file)
@@ -1006,7 +1006,7 @@ bool RenderStyle::contentDataEquivalent(const RenderStyle* otherStyle) const
     return !c1 && !c2;
 }
 
-void RenderStyle::setContent(CachedObject* o, bool add)
+void RenderStyle::setContent(CachedResource* o, bool add)
 {
     if (!o)
         return; // The object is null. Nothing to do. Just bail.
index ebf8ff8850143b7c01c40ee52e250961f8b25735..55fbad14a53ac9efa8f7a3cb357ecbecb77b0244 100644 (file)
@@ -62,7 +62,7 @@ using std::max;
 
 class CSSStyleSelector;
 class CachedImage;
-class CachedObject;
+class CachedResource;
 class ShadowValue;
 class StringImpl;
 
@@ -874,12 +874,12 @@ struct ContentData {
     ContentType contentType() { return _contentType; }
 
     StringImpl* contentText() { if (contentType() == CONTENT_TEXT) return _content.text; return 0; }
-    CachedObject* contentObject() { if (contentType() == CONTENT_OBJECT) return _content.object; return 0; }
+    CachedResource* contentObject() { if (contentType() == CONTENT_OBJECT) return _content.object; return 0; }
     
     ContentType _contentType;
 
     union {
-        CachedObject* object;
+        CachedResource* object;
         StringImpl* text;
         // counters...
     } _content ;
@@ -1588,7 +1588,7 @@ public:
     ContentData* contentData() { return content; }
     bool contentDataEquivalent(const RenderStyle *otherStyle) const;
     void setContent(StringImpl* s, bool add = false);
-    void setContent(CachedObject* o, bool add = false);
+    void setContent(CachedResource* o, bool add = false);
 
     bool inheritedNotEqual( RenderStyle *other ) const;
 
index 94336eea3cb6c5f4f0e6a48440d1466c29f44d24..a5dd09adc2b5f24e45b505c29145d7fa91b40f72 100644 (file)
@@ -39,7 +39,6 @@ Base settings shared by all Bakefile-based ports.
     <include file="WebCoreSources.bkl"/>
     
        <set var="WEBCORE_BASE_SOURCES">        
-               $(WEBCORE_SOURCES_KWQ)
                $(WEBCORE_SOURCES_DERIVEDSOURCES)
                $(WEBCORE_SOURCES_KHTML)
                $(WEBCORE_SOURCES_MISC)
@@ -88,7 +87,6 @@ Base settings shared by all Bakefile-based ports.
         <include>$(SRCDIR)/html</include>
         <include>$(SRCDIR)/css</include>
         <include>$(SRCDIR)/dom</include>
-        <include>$(SRCDIR)/kwq</include>
         <include>$(SRCDIR)/loader</include>
         <include>$(SRCDIR)/page</include>
         <include>$(SRCDIR)/platform</include>
index f1fcd16f3ddb9105af406966aefa68838603e6a0..2e77233f695c4ea5523ea43b20d2b63ed2c098ff 100644 (file)
@@ -25,7 +25,7 @@
 
 #ifdef KHTML_XSLT
 
-#include "CachedObjectClient.h"
+#include "CachedResourceClient.h"
 #include "StyleBase.h"
 #include "XSLStyleSheet.h"
 
@@ -33,7 +33,7 @@ namespace WebCore {
 
 class CachedXSLStyleSheet;
 
-class XSLImportRule : public CachedObjectClient, public StyleBase {
+class XSLImportRule : public CachedResourceClient, public StyleBase {
 public:
     XSLImportRule(StyleBase* parent, const String& href);
     virtual ~XSLImportRule();
@@ -44,7 +44,7 @@ public:
     virtual bool isImportRule() { return true; }
     XSLStyleSheet* parentStyleSheet() const;
     
-    // from CachedObjectClient
+    // from CachedResourceClient
     virtual void setStyleSheet(const String& url, const String& sheet);
     
     bool isLoading();