- move all but the last 12 files out of kwq directory
authordarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 9 Jul 2006 17:03:15 +0000 (17:03 +0000)
committerdarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 9 Jul 2006 17:03:15 +0000 (17:03 +0000)
        - removed a few unused source files I discovered

        * WebCore.vcproj/WebCore/WebCore.vcproj: Update for new file locations.
        * WebCore.xcodeproj/project.pbxproj: Ditto.

        * bridge/mac/FrameMac.mm:
        * dom/Element.h:
        * html/HTMLImageLoader.cpp:
        * loader/Cache.cpp:
        * loader/Cache.h:
        * loader/CachedCSSStyleSheet.cpp:
        * loader/CachedCSSStyleSheet.h:
        * loader/CachedImage.cpp:
        * loader/CachedImage.h:
        * loader/CachedObject.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:
        * page/Frame.cpp:
        * page/Frame.h:
        * page/FramePrivate.h:
        * platform/gdk/TemporaryLinkStubs.cpp:
        * platform/win/TemporaryLinkStubs.cpp:
        * rendering/DeprecatedSlider.cpp:
        * rendering/RenderObject.h:
        * xml/xmlhttprequest.cpp:
        Updated includes as needed for file location changes. Changed
        CachePolicy uses to match new filename and enum names.

        * loader/CachedResource.cpp: Removed.
        * loader/CachedResource.h: Removed.
        * loader/CachedResourceClient.h: Removed.
        * loader/CachedResourceClientWalker.cpp: Removed.
        * loader/CachedResourceClientWalker.h: Removed.
        The above files were checked in by accident a while back. The rename of
        CachedObject to CachedResource is now reflected in do-webcore-rename,
        and will be done soon.

        * kwq/AffineTransform.cpp: Removed.
        * kwq/AffineTransform.h: Removed.
        * kwq/CacheControl.h: Removed.
        * kwq/DeprecatedPtrQueue.h: Removed.
        * kwq/FileButton.h: Removed.
        * kwq/FileButton.mm: Removed.
        * kwq/ListBox.h: Removed.
        * kwq/ListBox.mm: Removed.
        * kwq/LoaderFunctions.h: Removed.
        * kwq/LoaderFunctions.mm: Removed.
        * kwq/PopUpButton.h: Removed.
        * kwq/PopUpButton.mm: Removed.
        * kwq/SSLKeyGenerator.h: Removed.
        * kwq/SSLKeyGenerator.mm: Removed.
        * kwq/Settings.h: Removed.
        * kwq/TextBox.h: Removed.
        * kwq/TextBox.mm: Removed.
        * kwq/TextField.h: Removed.
        * kwq/TextField.mm: Removed.
        * kwq/WebCoreScrollBar.h: Removed.
        * kwq/WebCoreScrollBar.mm: Removed.
        * kwq/WebCoreSlider.h: Removed.
        * kwq/WebCoreSlider.mm: Removed.

        * loader/CachePolicy.h: Added.
        * loader/LoaderFunctions.h: Added.

        * loader/mac/LoaderFunctionsMac.mm: Added.

        * page/Settings.h: Added.

        * platform/AffineTransform.cpp: Added.
        * platform/AffineTransform.h: Added.
        * platform/DeprecatedPtrQueue.h: Added.
        * platform/FileButton.h: Added.
        * platform/ListBox.h: Added.
        * platform/PopUpButton.h: Added.
        * platform/SSLKeyGenerator.h: Added.
        * platform/ScrollBar.h: Added.
        * platform/Slider.h: Added.
        * platform/TextBox.h: Added.
        * platform/TextField.h: Added.

        * platform/cg/AffineTransformCG.cpp: Added.

        * platform/mac/FileButtonMac.mm: Added.
        * platform/mac/ListBoxMac.mm: Added.
        * platform/mac/PopUpButtonMac.mm: Added.
        * platform/mac/SSLKeyGeneratorMac.mm: Added.
        * platform/mac/ScrollBarMac.mm: Added.
        * platform/mac/ScrollBarMac.mm: Added.
        * platform/mac/SliderMac.mm: Added.
        * platform/mac/SliderMac.mm: Added.
        * platform/mac/TextBoxMac.mm: Added.
        * platform/mac/TextFieldMac.mm: Added.

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

58 files changed:
WebCore/ChangeLog
WebCore/WebCore.vcproj/WebCore/WebCore.vcproj
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/bridge/mac/FrameMac.mm
WebCore/dom/Element.h
WebCore/html/HTMLImageLoader.cpp
WebCore/loader/Cache.cpp
WebCore/loader/Cache.h
WebCore/loader/CachePolicy.h [new file with mode: 0644]
WebCore/loader/CachedCSSStyleSheet.cpp
WebCore/loader/CachedCSSStyleSheet.h
WebCore/loader/CachedImage.cpp
WebCore/loader/CachedImage.h
WebCore/loader/CachedObject.h
WebCore/loader/CachedResource.cpp [deleted file]
WebCore/loader/CachedResource.h [deleted file]
WebCore/loader/CachedResourceClient.h [deleted file]
WebCore/loader/CachedResourceClientWalker.cpp [deleted file]
WebCore/loader/CachedResourceClientWalker.h [deleted file]
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 [moved from WebCore/kwq/LoaderFunctions.h with 100% similarity]
WebCore/loader/mac/LoaderFunctionsMac.mm [moved from WebCore/kwq/LoaderFunctions.mm with 100% similarity]
WebCore/page/Frame.cpp
WebCore/page/Frame.h
WebCore/page/FramePrivate.h
WebCore/page/Settings.h [moved from WebCore/kwq/Settings.h with 100% similarity]
WebCore/platform/AffineTransform.cpp [moved from WebCore/kwq/CacheControl.h with 83% similarity]
WebCore/platform/AffineTransform.h [moved from WebCore/kwq/AffineTransform.h with 88% similarity]
WebCore/platform/DeprecatedPtrQueue.h [moved from WebCore/kwq/DeprecatedPtrQueue.h with 100% similarity]
WebCore/platform/FileButton.h [moved from WebCore/kwq/FileButton.h with 100% similarity]
WebCore/platform/ListBox.h [moved from WebCore/kwq/ListBox.h with 100% similarity]
WebCore/platform/PopUpButton.h [moved from WebCore/kwq/PopUpButton.h with 100% similarity]
WebCore/platform/SSLKeyGenerator.h [moved from WebCore/kwq/SSLKeyGenerator.h with 100% similarity]
WebCore/platform/ScrollBar.h [moved from WebCore/kwq/WebCoreScrollBar.h with 100% similarity]
WebCore/platform/Slider.h [moved from WebCore/kwq/WebCoreSlider.h with 100% similarity]
WebCore/platform/TextBox.h [moved from WebCore/kwq/TextBox.h with 100% similarity]
WebCore/platform/TextField.h [moved from WebCore/kwq/TextField.h with 100% similarity]
WebCore/platform/cg/AffineTransformCG.cpp [moved from WebCore/kwq/AffineTransform.cpp with 95% similarity]
WebCore/platform/gdk/TemporaryLinkStubs.cpp
WebCore/platform/mac/FileButtonMac.mm [moved from WebCore/kwq/FileButton.mm with 100% similarity]
WebCore/platform/mac/ListBoxMac.mm [moved from WebCore/kwq/ListBox.mm with 100% similarity]
WebCore/platform/mac/PopUpButtonMac.mm [moved from WebCore/kwq/PopUpButton.mm with 100% similarity]
WebCore/platform/mac/SSLKeyGeneratorMac.mm [moved from WebCore/kwq/SSLKeyGenerator.mm with 100% similarity]
WebCore/platform/mac/ScrollBarMac.mm [moved from WebCore/kwq/WebCoreScrollBar.mm with 99% similarity]
WebCore/platform/mac/SliderMac.mm [moved from WebCore/kwq/WebCoreSlider.mm with 99% similarity]
WebCore/platform/mac/TextBoxMac.mm [moved from WebCore/kwq/TextBox.mm with 100% similarity]
WebCore/platform/mac/TextFieldMac.mm [moved from WebCore/kwq/TextField.mm with 100% similarity]
WebCore/platform/win/TemporaryLinkStubs.cpp
WebCore/rendering/DeprecatedSlider.cpp
WebCore/rendering/RenderObject.h
WebCore/xml/xmlhttprequest.cpp

index 6d03222..0c68097 100644 (file)
@@ -1,5 +1,107 @@
 2006-07-09  Darin Adler  <darin@apple.com>
 
+        - move all but the last 12 files out of kwq directory
+        - removed a few unused source files I discovered
+
+        * WebCore.vcproj/WebCore/WebCore.vcproj: Update for new file locations.
+        * WebCore.xcodeproj/project.pbxproj: Ditto.
+
+        * bridge/mac/FrameMac.mm:
+        * dom/Element.h:
+        * html/HTMLImageLoader.cpp:
+        * loader/Cache.cpp:
+        * loader/Cache.h:
+        * loader/CachedCSSStyleSheet.cpp:
+        * loader/CachedCSSStyleSheet.h:
+        * loader/CachedImage.cpp:
+        * loader/CachedImage.h:
+        * loader/CachedObject.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:
+        * page/Frame.cpp:
+        * page/Frame.h:
+        * page/FramePrivate.h:
+        * platform/gdk/TemporaryLinkStubs.cpp:
+        * platform/win/TemporaryLinkStubs.cpp:
+        * rendering/DeprecatedSlider.cpp:
+        * rendering/RenderObject.h:
+        * xml/xmlhttprequest.cpp:
+        Updated includes as needed for file location changes. Changed
+        CachePolicy uses to match new filename and enum names.
+
+        * loader/CachedResource.cpp: Removed.
+        * loader/CachedResource.h: Removed.
+        * loader/CachedResourceClient.h: Removed.
+        * loader/CachedResourceClientWalker.cpp: Removed.
+        * loader/CachedResourceClientWalker.h: Removed.
+        The above files were checked in by accident a while back. The rename of
+        CachedObject to CachedResource is now reflected in do-webcore-rename,
+        and will be done soon.
+
+        * kwq/AffineTransform.cpp: Removed.
+        * kwq/AffineTransform.h: Removed.
+        * kwq/CacheControl.h: Removed.
+        * kwq/DeprecatedPtrQueue.h: Removed.
+        * kwq/FileButton.h: Removed.
+        * kwq/FileButton.mm: Removed.
+        * kwq/ListBox.h: Removed.
+        * kwq/ListBox.mm: Removed.
+        * kwq/LoaderFunctions.h: Removed.
+        * kwq/LoaderFunctions.mm: Removed.
+        * kwq/PopUpButton.h: Removed.
+        * kwq/PopUpButton.mm: Removed.
+        * kwq/SSLKeyGenerator.h: Removed.
+        * kwq/SSLKeyGenerator.mm: Removed.
+        * kwq/Settings.h: Removed.
+        * kwq/TextBox.h: Removed.
+        * kwq/TextBox.mm: Removed.
+        * kwq/TextField.h: Removed.
+        * kwq/TextField.mm: Removed.
+        * kwq/WebCoreScrollBar.h: Removed.
+        * kwq/WebCoreScrollBar.mm: Removed.
+        * kwq/WebCoreSlider.h: Removed.
+        * kwq/WebCoreSlider.mm: Removed.
+
+        * loader/CachePolicy.h: Added.
+        * loader/LoaderFunctions.h: Added.
+
+        * loader/mac/LoaderFunctionsMac.mm: Added.
+
+        * page/Settings.h: Added.
+
+        * platform/AffineTransform.cpp: Added.
+        * platform/AffineTransform.h: Added.
+        * platform/DeprecatedPtrQueue.h: Added.
+        * platform/FileButton.h: Added.
+        * platform/ListBox.h: Added.
+        * platform/PopUpButton.h: Added.
+        * platform/SSLKeyGenerator.h: Added.
+        * platform/ScrollBar.h: Added.
+        * platform/Slider.h: Added.
+        * platform/TextBox.h: Added.
+        * platform/TextField.h: Added.
+
+        * platform/cg/AffineTransformCG.cpp: Added.
+
+        * platform/mac/FileButtonMac.mm: Added.
+        * platform/mac/ListBoxMac.mm: Added.
+        * platform/mac/PopUpButtonMac.mm: Added.
+        * platform/mac/SSLKeyGeneratorMac.mm: Added.
+        * platform/mac/ScrollBarMac.mm: Added.
+        * platform/mac/ScrollBarMac.mm: Added.
+        * platform/mac/SliderMac.mm: Added.
+        * platform/mac/SliderMac.mm: Added.
+        * platform/mac/TextBoxMac.mm: Added.
+        * platform/mac/TextFieldMac.mm: Added.
+
+2006-07-09  Darin Adler  <darin@apple.com>
+
         - move 4 files out of kwq directory
         - make some minor project adjustments for the WebCore project
 
index 27b2ab4..a1dea58 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)\..\..\khtml&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)\..\..\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
                                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)\..\..\khtml&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)\..\..\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
                                PreprocessorDefinitions="WIN32;KHTML_NO_XBL;KHTML_XSLT;XPATH_SUPPORT;NDEBUG"\r
                                ExceptionHandling="0"\r
                                RuntimeLibrary="2"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kwq\PopUpButton.h"\r
+                               RelativePath="..\..\page\Settings.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\kwq\FileButton.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\kwq\Settings.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\kwq\SSLKeyGenerator.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\kwq\TextField.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\kwq\ListBox.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\kwq\LoaderFunctions.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\kwq\DeprecatedPtrQueue.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\kwq\WebCoreScrollBar.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\kwq\WebCoreSlider.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\kwq\TextBox.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\kwq\AffineTransform.h"\r
+                               RelativePath="..\..\loader\LoaderFunctions.h"\r
                                >\r
                        </File>\r
                </Filter>\r
                        Name="platform"\r
                        >\r
                        <File\r
+                               RelativePath="..\..\platform\AffineTransform.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\platform\Arena.cpp"\r
                                >\r
                        </File>\r
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\platform\DeprecatedPtrQueue.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\platform\DeprecatedString.cpp"\r
                                >\r
                        </File>\r
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\platform\FileButton.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\platform\FloatPoint.cpp"\r
                                >\r
                        </File>\r
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\platform\ListBox.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\platform\LocalizedStrings.h"\r
                                >\r
                        </File>\r
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\platform\PopUpButton.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\platform\RegularExpression.cpp"\r
                                >\r
                        </File>\r
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\platform\ScrollBar.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\platform\ScrollView.h"\r
                                >\r
                        </File>\r
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\platform\Slider.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\platform\SSLKeyGenerator.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\platform\StaticConstructors.h"\r
                                >\r
                        </File>\r
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\platform\TextBox.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\platform\TextEncoding.cpp"\r
                                >\r
                        </File>\r
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\platform\TextField.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\platform\TextStream.cpp"\r
                                >\r
                        </File>\r
index 72e80ab..ffdc4a4 100644 (file)
                93CD4FE30995F9EA007ECC97 /* StringImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93CD4FDC0995F9EA007ECC97 /* StringImpl.cpp */; };
                93CD4FE40995F9EA007ECC97 /* StringImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 93CD4FDD0995F9EA007ECC97 /* StringImpl.h */; };
                93CD4FEC0995FD2A007ECC97 /* PlatformString.h in Headers */ = {isa = PBXBuildFile; fileRef = 93CD4FEB0995FD2A007ECC97 /* PlatformString.h */; };
+               93CF35AA0A6169F700543E52 /* AffineTransformCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93CF35A90A6169F700543E52 /* AffineTransformCG.cpp */; };
                93E47C5C09BE2BBB0019C5C1 /* PageMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93E47C5B09BE2BBB0019C5C1 /* PageMac.mm */; };
                93E62D9B0985F41600E1B5E3 /* SystemTime.h in Headers */ = {isa = PBXBuildFile; fileRef = 93E62D990985F41600E1B5E3 /* SystemTime.h */; };
                93EB169509F880B00091F8FF /* WebCoreSystemInterface.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93EB169409F880B00091F8FF /* WebCoreSystemInterface.mm */; };
                93F1992F08245E59001E9ABC /* Cursor.h in Headers */ = {isa = PBXBuildFile; fileRef = F587868402DE3B8601EA4122 /* Cursor.h */; };
                93F1993908245E59001E9ABC /* FileButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 93CCF7D4033BD43C008635CE /* FileButton.h */; };
                93F1994F08245E59001E9ABC /* Settings.h in Headers */ = {isa = PBXBuildFile; fileRef = F587863A02DE3A1401EA4122 /* Settings.h */; };
-               93F1995008245E59001E9ABC /* CacheControl.h in Headers */ = {isa = PBXBuildFile; fileRef = F587864902DE3A9A01EA4122 /* CacheControl.h */; };
+               93F1995008245E59001E9ABC /* CachePolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = F587864902DE3A9A01EA4122 /* CachePolicy.h */; };
                93F1995408245E59001E9ABC /* JavaAppletWidget.h in Headers */ = {isa = PBXBuildFile; fileRef = F587864502DE3A7701EA4122 /* JavaAppletWidget.h */; };
                93F1996308245E59001E9ABC /* SSLKeyGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866202DE3B1101EA4122 /* SSLKeyGenerator.h */; };
                93F1996B08245E59001E9ABC /* TextField.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869802DE3B8601EA4122 /* TextField.h */; };
                93F199AD08245E59001E9ABC /* WebCoreResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = F587855002DE375901EA4122 /* WebCoreResourceLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F199AF08245E59001E9ABC /* WebCoreSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = F565AE8502ECA583018635CA /* WebCoreSettings.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F199B308245E59001E9ABC /* WebCoreViewFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = F587855402DE375901EA4122 /* WebCoreViewFactory.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               93F199B808245E59001E9ABC /* WebCoreScrollBar.h in Headers */ = {isa = PBXBuildFile; fileRef = BC7B2AF80450824100A8000F /* WebCoreScrollBar.h */; };
+               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 */; };
                93F199CF08245E59001E9ABC /* AtomicStringList.h in Headers */ = {isa = PBXBuildFile; fileRef = BC3B364705C9D5E200E42902 /* AtomicStringList.h */; };
                93F199D508245E59001E9ABC /* WebCoreEditCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = BEF7EEA005FF8F0D009717EE /* WebCoreEditCommand.h */; };
                93F199DE08245E59001E9ABC /* Position.h in Headers */ = {isa = PBXBuildFile; fileRef = BE91FC8B06133666005E3790 /* Position.h */; };
-               93F199E008245E59001E9ABC /* WebCoreSlider.h in Headers */ = {isa = PBXBuildFile; fileRef = BC86FB8D061F5C23006BB822 /* WebCoreSlider.h */; };
+               93F199E008245E59001E9ABC /* Slider.h in Headers */ = {isa = PBXBuildFile; fileRef = BC86FB8D061F5C23006BB822 /* Slider.h */; };
                93F199E508245E59001E9ABC /* HTMLCanvasElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F6A3D60663BF04004D2919 /* HTMLCanvasElement.h */; };
                93F199E708245E59001E9ABC /* ClipboardMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D90660B0665D937006B6F1A /* ClipboardMac.h */; };
                93F199EC08245E59001E9ABC /* XSLStyleSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = BC06F24A06D18A7E004A6FA3 /* XSLStyleSheet.h */; };
                93F19A0908245E59001E9ABC /* southWestResizeCursor.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 84C0FA2C052B966D000440A1 /* southWestResizeCursor.tiff */; };
                93F19A0A08245E59001E9ABC /* waitCursor.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 84C0FA2D052B966D000440A1 /* waitCursor.tiff */; };
                93F19A0B08245E59001E9ABC /* westResizeCursor.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 84C0FA2E052B966D000440A1 /* westResizeCursor.tiff */; };
-               93F19A1708245E59001E9ABC /* PopUpButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784D202DE375901EA4122 /* PopUpButton.mm */; };
+               93F19A1708245E59001E9ABC /* PopUpButtonMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784D202DE375901EA4122 /* PopUpButtonMac.mm */; };
                93F19A1808245E59001E9ABC /* DeprecatedCString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F58784D502DE375901EA4122 /* DeprecatedCString.cpp */; };
                93F19A2608245E59001E9ABC /* CursorMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784F002DE375901EA4122 /* CursorMac.mm */; };
                93F19A2E08245E59001E9ABC /* JavaAppletWidget.mm in Sources */ = {isa = PBXBuildFile; fileRef = F58784FF02DE375901EA4122 /* JavaAppletWidget.mm */; };
-               93F19A3108245E59001E9ABC /* LoaderFunctions.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587850302DE375901EA4122 /* LoaderFunctions.mm */; };
-               93F19A3A08245E59001E9ABC /* TextField.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851202DE375901EA4122 /* TextField.mm */; };
-               93F19A3B08245E59001E9ABC /* ListBox.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851402DE375901EA4122 /* ListBox.mm */; };
+               93F19A3108245E59001E9ABC /* LoaderFunctionsMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587850302DE375901EA4122 /* LoaderFunctionsMac.mm */; };
+               93F19A3A08245E59001E9ABC /* TextFieldMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851202DE375901EA4122 /* TextFieldMac.mm */; };
+               93F19A3B08245E59001E9ABC /* ListBoxMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851402DE375901EA4122 /* ListBoxMac.mm */; };
                93F19A3C08245E59001E9ABC /* DeprecatedPtrListImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587851602DE375901EA4122 /* DeprecatedPtrListImpl.cpp */; };
                93F19A3F08245E59001E9ABC /* WebCoreTextField.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851C02DE375901EA4122 /* WebCoreTextField.mm */; };
                93F19A4A08245E59001E9ABC /* RegularExpression.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587852B02DE375901EA4122 /* RegularExpression.cpp */; };
                93F19A5108245E59001E9ABC /* WebCoreTextArea.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587853602DE375901EA4122 /* WebCoreTextArea.mm */; };
-               93F19A5308245E59001E9ABC /* TextBox.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587853802DE375901EA4122 /* TextBox.mm */; };
+               93F19A5308245E59001E9ABC /* TextBoxMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587853802DE375901EA4122 /* TextBoxMac.mm */; };
                93F19A5408245E59001E9ABC /* TextStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587853902DE375901EA4122 /* TextStream.cpp */; };
                93F19A5608245E59001E9ABC /* DeprecatedValueListImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F587853C02DE375901EA4122 /* DeprecatedValueListImpl.cpp */; };
                93F19A5F08245E59001E9ABC /* WebCoreViewFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = F587855502DE375901EA4122 /* WebCoreViewFactory.m */; };
                93F19AC208245E59001E9ABC /* WebCoreSettings.mm in Sources */ = {isa = PBXBuildFile; fileRef = F565AE8602ECA583018635CA /* WebCoreSettings.mm */; };
                93F19AC608245E59001E9ABC /* WebCoreEncodings.mm in Sources */ = {isa = PBXBuildFile; fileRef = F56234E003026D7301629B47 /* WebCoreEncodings.mm */; };
                93F19AC808245E59001E9ABC /* WebCoreHistory.m in Sources */ = {isa = PBXBuildFile; fileRef = F5517DC3031AB56301A80180 /* WebCoreHistory.m */; };
-               93F19ACC08245E59001E9ABC /* FileButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93CCF7D5033BD43C008635CE /* FileButton.mm */; };
+               93F19ACC08245E59001E9ABC /* FileButtonMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93CCF7D5033BD43C008635CE /* FileButtonMac.mm */; };
                93F19ACD08245E59001E9ABC /* WebCoreResourceLoaderImp.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93386B91037045B3008635CE /* WebCoreResourceLoaderImp.mm */; };
                93F19AD208245E59001E9ABC /* WebCorePageState.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9394E0A503AA5BBE008635CE /* WebCorePageState.mm */; };
                93F19AD508245E59001E9ABC /* RenderTreeAsText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93955A4203D72932008635CE /* RenderTreeAsText.cpp */; };
-               93F19ADC08245E59001E9ABC /* WebCoreScrollBar.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC7B2AF90450824100A8000F /* WebCoreScrollBar.mm */; };
+               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 */; };
                93F19AE108245E59001E9ABC /* BlockExceptions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 65F80697054D9F86008BF776 /* BlockExceptions.mm */; };
                93F19AE508245E59001E9ABC /* WebCoreKeyGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = 84B2B1F8056BEF3A00D2B771 /* WebCoreKeyGenerator.m */; };
-               93F19AE608245E59001E9ABC /* SSLKeyGenerator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84B2B24F056BF15F00D2B771 /* SSLKeyGenerator.mm */; };
+               93F19AE608245E59001E9ABC /* SSLKeyGeneratorMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84B2B24F056BF15F00D2B771 /* SSLKeyGeneratorMac.mm */; };
                93F19AF708245E59001E9ABC /* WebCoreEditCommand.mm in Sources */ = {isa = PBXBuildFile; fileRef = BEF7EEA105FF8F0D009717EE /* WebCoreEditCommand.mm */; };
                93F19AF808245E59001E9ABC /* Position.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE91FC8C06133666005E3790 /* Position.cpp */; };
-               93F19AFA08245E59001E9ABC /* WebCoreSlider.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC86FB8E061F5C23006BB822 /* WebCoreSlider.mm */; };
+               93F19AFA08245E59001E9ABC /* SliderMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC86FB8E061F5C23006BB822 /* SliderMac.mm */; };
                93F19AFD08245E59001E9ABC /* HTMLCanvasElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51F6A3D50663BF04004D2919 /* HTMLCanvasElement.cpp */; };
                93F19AFF08245E59001E9ABC /* ClipboardMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D90660C0665D937006B6F1A /* ClipboardMac.mm */; };
                93F19B0308245E59001E9ABC /* XSLStyleSheet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC06F24906D18A7E004A6FA3 /* XSLStyleSheet.cpp */; };
                840633070731A77200DB1FD1 /* libxslt.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxslt.dylib; path = /usr/lib/libxslt.dylib; sourceTree = "<absolute>"; };
                84B2B1F7056BEF3A00D2B771 /* WebCoreKeyGenerator.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreKeyGenerator.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                84B2B1F8056BEF3A00D2B771 /* WebCoreKeyGenerator.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebCoreKeyGenerator.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               84B2B24F056BF15F00D2B771 /* SSLKeyGenerator.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SSLKeyGenerator.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               84B2B24F056BF15F00D2B771 /* SSLKeyGeneratorMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SSLKeyGeneratorMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                84C0FA24052B966D000440A1 /* eastResizeCursor.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = eastResizeCursor.tiff; sourceTree = "<group>"; };
                84C0FA25052B966D000440A1 /* helpCursor.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = helpCursor.tiff; sourceTree = "<group>"; };
                84C0FA26052B966D000440A1 /* moveCursor.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = moveCursor.tiff; sourceTree = "<group>"; };
                93CA4CA209DF93FA00DF8677 /* svg.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg.css; sourceTree = "<group>"; };
                93CA4CA309DF93FA00DF8677 /* tokenizer.flex */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tokenizer.flex; sourceTree = "<group>"; };
                93CCF7D4033BD43C008635CE /* FileButton.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = FileButton.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               93CCF7D5033BD43C008635CE /* FileButton.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FileButton.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               93CCF7D5033BD43C008635CE /* FileButtonMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FileButtonMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                93CD4FD70995F9EA007ECC97 /* AtomicString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AtomicString.cpp; sourceTree = "<group>"; };
                93CD4FD80995F9EA007ECC97 /* AtomicString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AtomicString.h; sourceTree = "<group>"; };
                93CD4FD90995F9EA007ECC97 /* AtomicStringImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AtomicStringImpl.h; sourceTree = "<group>"; };
                93CD4FDC0995F9EA007ECC97 /* StringImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringImpl.cpp; sourceTree = "<group>"; };
                93CD4FDD0995F9EA007ECC97 /* StringImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringImpl.h; sourceTree = "<group>"; };
                93CD4FEB0995FD2A007ECC97 /* PlatformString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformString.h; sourceTree = "<group>"; };
+               93CF35A90A6169F700543E52 /* AffineTransformCG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AffineTransformCG.cpp; sourceTree = "<group>"; };
                93E47C5B09BE2BBB0019C5C1 /* PageMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = PageMac.mm; sourceTree = "<group>"; };
                93E62D990985F41600E1B5E3 /* SystemTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SystemTime.h; sourceTree = "<group>"; };
                93EB169409F880B00091F8FF /* WebCoreSystemInterface.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreSystemInterface.mm; sourceTree = "<group>"; };
                BC73E3180978AFFB00EDFF8A /* IntPoint.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = IntPoint.h; sourceTree = "<group>"; };
                BC73E3900978CED700EDFF8A /* FloatPoint.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FloatPoint.cpp; sourceTree = "<group>"; };
                BC73E3910978CED700EDFF8A /* FloatPoint.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FloatPoint.h; sourceTree = "<group>"; };
-               BC7B2AF80450824100A8000F /* WebCoreScrollBar.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreScrollBar.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               BC7B2AF90450824100A8000F /* WebCoreScrollBar.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreScrollBar.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               BC86FB8D061F5C23006BB822 /* WebCoreSlider.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreSlider.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               BC86FB8E061F5C23006BB822 /* WebCoreSlider.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreSlider.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               BC7B2AF80450824100A8000F /* ScrollBar.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = ScrollBar.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               BC7B2AF90450824100A8000F /* ScrollBarMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ScrollBarMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               BC86FB8D061F5C23006BB822 /* Slider.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Slider.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               BC86FB8E061F5C23006BB822 /* SliderMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SliderMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                BC92F1DB0A40AEA300AC0746 /* DeprecatedSlider.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedSlider.cpp; sourceTree = "<group>"; };
                BC92F1DC0A40AEA300AC0746 /* DeprecatedSlider.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DeprecatedSlider.h; sourceTree = "<group>"; };
                BC9C328A09933A6D001D6924 /* ImageAnimationObserver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ImageAnimationObserver.h; sourceTree = "<group>"; };
                F56234E003026D7301629B47 /* WebCoreEncodings.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreEncodings.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F565AE8502ECA583018635CA /* WebCoreSettings.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreSettings.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F565AE8602ECA583018635CA /* WebCoreSettings.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreSettings.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F58784D202DE375901EA4122 /* PopUpButton.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PopUpButton.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F58784D202DE375901EA4122 /* PopUpButtonMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PopUpButtonMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F58784D502DE375901EA4122 /* DeprecatedCString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedCString.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F58784F002DE375901EA4122 /* CursorMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CursorMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F58784FF02DE375901EA4122 /* JavaAppletWidget.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = JavaAppletWidget.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F587850302DE375901EA4122 /* LoaderFunctions.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LoaderFunctions.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F587851202DE375901EA4122 /* TextField.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TextField.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F587850302DE375901EA4122 /* LoaderFunctionsMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LoaderFunctionsMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F587851202DE375901EA4122 /* TextFieldMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TextFieldMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587851302DE375901EA4122 /* ListBox.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = ListBox.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F587851402DE375901EA4122 /* ListBox.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ListBox.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F587851402DE375901EA4122 /* ListBoxMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ListBoxMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587851502DE375901EA4122 /* DeprecatedPtrListImpl.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedPtrListImpl.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587851602DE375901EA4122 /* DeprecatedPtrListImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedPtrListImpl.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587851702DE375901EA4122 /* LoaderFunctions.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = LoaderFunctions.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587852B02DE375901EA4122 /* RegularExpression.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RegularExpression.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587853502DE375901EA4122 /* WebCoreTextArea.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreTextArea.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587853602DE375901EA4122 /* WebCoreTextArea.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreTextArea.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F587853802DE375901EA4122 /* TextBox.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TextBox.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F587853802DE375901EA4122 /* TextBoxMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TextBoxMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587853902DE375901EA4122 /* TextStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextStream.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587853B02DE375901EA4122 /* DeprecatedValueListImpl.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedValueListImpl.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587853C02DE375901EA4122 /* DeprecatedValueListImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedValueListImpl.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587855502DE375901EA4122 /* WebCoreViewFactory.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebCoreViewFactory.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587863A02DE3A1401EA4122 /* Settings.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Settings.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587864502DE3A7701EA4122 /* JavaAppletWidget.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = JavaAppletWidget.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               F587864902DE3A9A01EA4122 /* CacheControl.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = CacheControl.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               F587864902DE3A9A01EA4122 /* CachePolicy.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = CachePolicy.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587866202DE3B1101EA4122 /* SSLKeyGenerator.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = SSLKeyGenerator.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587868202DE3B8601EA4122 /* PopUpButton.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = PopUpButton.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                F587868302DE3B8601EA4122 /* DeprecatedCString.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedCString.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                        path = icon;
                        sourceTree = "<group>";
                };
-               55998A57052B598F0017A6C1 /* Accessibility */ = {
-                       isa = PBXGroup;
-                       children = (
-                               55998A5A052B59CC0017A6C1 /* WebCoreAXObject.h */,
-                               55998A5B052B59CC0017A6C1 /* WebCoreAXObject.mm */,
-                               55998A5C052B59CC0017A6C1 /* AccessibilityObjectCache.h */,
-                               55998A5D052B59CC0017A6C1 /* AccessibilityObjectCache.mm */,
-                       );
-                       name = Accessibility;
-                       sourceTree = "<group>";
-               };
                656580EC09D12B20000E61D7 /* Derived Sources */ = {
                        isa = PBXGroup;
                        children = (
                                6582A14909999D6C00BEEB6D /* ColorMac.mm */,
                                9352087609BD453400F2038D /* CookieJar.mm */,
                                F58784F002DE375901EA4122 /* CursorMac.mm */,
+                               651B4D8E09AC859F0029F1EF /* DeprecatedStringListMac.mm */,
+                               6582A17709999EA000BEEB6D /* DeprecatedStringMac.mm */,
                                65F5386809B2BFDA00F3DC4A /* ExtraCFEncodings.h */,
+                               93CCF7D5033BD43C008635CE /* FileButtonMac.mm */,
                                6582A14A09999D6C00BEEB6D /* FloatPointMac.mm */,
                                6582A14B09999D6C00BEEB6D /* FloatRectMac.mm */,
                                6582A14C09999D6C00BEEB6D /* FloatSizeMac.mm */,
                                BCF7C2330A16B5F80032F75B /* FontCacheMac.mm */,
                                BCC088850A1BD78D006189A6 /* FontDataMac.mm */,
-                               BCEB377209B7BA3900CB38B1 /* FontMac.mm */,
                                BCF7C0980A1683580032F75B /* FontFallbackListMac.mm */,
+                               BCEB377209B7BA3900CB38B1 /* FontMac.mm */,
                                935C476C09AC4D6300A6AAB4 /* FoundationExtras.h */,
                                BC6DB4D30A1AFEEF00E5CD14 /* GlyphMapMac.cpp */,
                                935367E809AF77EF00D35CD6 /* GraphicsContextMac.mm */,
                                935C476E09AC4D7300A6AAB4 /* KeyEventMac.mm */,
                                6593923909AE435C002C531F /* KURLMac.mm */,
                                9352084409BD43B900F2038D /* Language.mm */,
+                               F587851402DE375901EA4122 /* ListBoxMac.mm */,
                                935207BF09BD412000F2038D /* LocalizedStringsMac.mm */,
                                65F5382409B2B57500F3DC4A /* mac-encodings.txt */,
-                               935C476F09AC4D7300A6AAB4 /* PlatformMouseEventMac.mm */,
                                6582A15209999D6D00BEEB6D /* PDFDocumentImage.h */,
                                6582A15309999D6D00BEEB6D /* PDFDocumentImage.mm */,
+                               935C476F09AC4D7300A6AAB4 /* PlatformMouseEventMac.mm */,
                                A82398A709B3ACF500B60641 /* PlugInInfoStoreMac.mm */,
-                               651B4D8E09AC859F0029F1EF /* DeprecatedStringListMac.mm */,
-                               6582A17709999EA000BEEB6D /* DeprecatedStringMac.mm */,
+                               F58784D202DE375901EA4122 /* PopUpButtonMac.mm */,
                                6582A15409999D6D00BEEB6D /* ScreenMac.mm */,
+                               BC7B2AF90450824100A8000F /* ScrollBarMac.mm */,
                                9353676A09AED88B00D35CD6 /* ScrollViewMac.mm */,
                                93309E9F099EB78C0056E581 /* SharedTimerMac.cpp */,
+                               BC86FB8E061F5C23006BB822 /* SliderMac.mm */,
+                               84B2B24F056BF15F00D2B771 /* SSLKeyGeneratorMac.mm */,
                                6582A15509999D6D00BEEB6D /* SystemTimeMac.cpp */,
                                9352071B09BD3BBB00F2038D /* TextBoundaries.mm */,
+                               F587853802DE375901EA4122 /* TextBoxMac.mm */,
                                6576F9D509B2484A000041F7 /* TextEncodingMac.cpp */,
+                               F587851202DE375901EA4122 /* TextFieldMac.mm */,
                                6545F67509B830180013006F /* TransferJobMac.mm */,
                                F5517DC2031AB56301A80180 /* WebCoreHistory.h */,
                                F5517DC3031AB56301A80180 /* WebCoreHistory.m */,
                                F587853602DE375901EA4122 /* WebCoreTextArea.mm */,
                                F587851B02DE375901EA4122 /* WebCoreTextField.h */,
                                F587851C02DE375901EA4122 /* WebCoreTextField.mm */,
+                               BC066F6C09FEB2FA00C589A7 /* WebCoreTextRenderer.h */,
+                               BCFE8E310A02A1D30009E61D /* WebCoreTextRenderer.mm */,
                                BE855F7F0701E83500239769 /* WebCoreView.h */,
                                BE8560510701F91100239769 /* WebCoreView.m */,
                                9352071C09BD3BBB00F2038D /* WebCoreWidgetHolder.h */,
-                               BCFE8E310A02A1D30009E61D /* WebCoreTextRenderer.mm */,
-                               BC066F6C09FEB2FA00C589A7 /* WebCoreTextRenderer.h */,
-                               935C477209AC4D7700A6AAB4 /* WheelEventMac.mm */,
-                               9380F47709A11ACC001FDB34 /* WidgetMac.mm */,
                                BC6DADEE0A195FDF00E5CD14 /* WebFontCache.h */,
                                BC6DADF90A19602B00E5CD14 /* WebFontCache.mm */,
+                               935C477209AC4D7700A6AAB4 /* WheelEventMac.mm */,
+                               9380F47709A11ACC001FDB34 /* WidgetMac.mm */,
                        );
                        path = mac;
                        sourceTree = "<group>";
                65BF02180974806300C43196 /* page */ = {
                        isa = PBXGroup;
                        children = (
+                               1403B99609EB13AF00797C7F /* DOMWindow.cpp */,
+                               1403B99509EB13AF00797C7F /* DOMWindow.h */,
+                               1403B90C09EB124500797C7F /* DOMWindow.idl */,
                                65BF02290974816300C43196 /* Frame.cpp */,
                                65BF022A0974816300C43196 /* Frame.h */,
                                65BF022B0974816300C43196 /* FramePrivate.h */,
                                65FEA86809833ADE00BED4AB /* Page.cpp */,
                                65A21467097A329100B9050A /* Page.h */,
                                65D1C1C909932B22000CB324 /* Plugin.h */,
-                               1403B90C09EB124500797C7F /* DOMWindow.idl */,
-                               1403B99509EB13AF00797C7F /* DOMWindow.h */,
-                               1403B99609EB13AF00797C7F /* DOMWindow.cpp */,
                                6522BCDE09C9DAA800C9BA7A /* ResourceRequest.h */,
+                               F587863A02DE3A1401EA4122 /* Settings.h */,
                        );
                        path = page;
                        sourceTree = "<group>";
                93032CCC09AEC36200F82A18 /* cg */ = {
                        isa = PBXGroup;
                        children = (
+                               93CF35A90A6169F700543E52 /* AffineTransformCG.cpp */,
                                936BDD1C0A031AEB004DF4AB /* GraphicsContextCG.cpp */,
                                93032CC709AEC34300F82A18 /* PathCG.cpp */,
                        );
                        children = (
                                93A1EAA70A563508006960A0 /* ImageDocumentMac.h */,
                                93A1EA9F0A5634C9006960A0 /* ImageDocumentMac.mm */,
+                               F587850302DE375901EA4122 /* LoaderFunctionsMac.mm */,
                        );
                        path = mac;
                        sourceTree = "<group>";
                                BCB16C0D0979C3BD00467741 /* CachedXBLDocument.h */,
                                BCB16C0E0979C3BD00467741 /* CachedXSLStyleSheet.cpp */,
                                BCB16C0F0979C3BD00467741 /* CachedXSLStyleSheet.h */,
+                               F587864902DE3A9A01EA4122 /* CachePolicy.h */,
                                F523D27802DE43D7018635CA /* Decoder.cpp */,
                                F523D27902DE43D7018635CA /* Decoder.h */,
                                BCB16C100979C3BD00467741 /* DocLoader.cpp */,
                                1AC694C60A3B1676003F5049 /* PluginDocument.h */,
                                BCB16C130979C3BD00467741 /* loader.cpp */,
                                BCB16C140979C3BD00467741 /* loader.h */,
+                               F587851702DE375901EA4122 /* LoaderFunctions.h */,
                                BCB16C150979C3BD00467741 /* Request.cpp */,
                                BCB16C160979C3BD00467741 /* Request.h */,
                                1A6937FF0A11100A00C127FE /* TextDocument.cpp */,
                        children = (
                                93032CCC09AEC36200F82A18 /* cg */,
                                6582A14809999D6C00BEEB6D /* mac */,
+                               A85D7A8C0879EC64006A9172 /* AffineTransform.cpp */,
+                               A85D7A8D0879EC64006A9172 /* AffineTransform.h */,
                                BCFB2F74097A2E1A00BA703D /* Arena.cpp */,
                                BCFB2F75097A2E1A00BA703D /* Arena.h */,
                                BCB16B890979B01400467741 /* ArrayImpl.cpp */,
                                F587869902DE3B8601EA4122 /* DeprecatedPtrList.h */,
                                F587851602DE375901EA4122 /* DeprecatedPtrListImpl.cpp */,
                                F587851502DE375901EA4122 /* DeprecatedPtrListImpl.h */,
+                               F58786AD02DE3B8601EA4122 /* DeprecatedPtrQueue.h */,
                                6582A13D09999CD600BEEB6D /* DeprecatedString.cpp */,
                                6582A13E09999CD600BEEB6D /* DeprecatedString.h */,
                                651B4D8309AC83370029F1EF /* DeprecatedStringList.cpp */,
                                F58786C202DE3B8601EA4122 /* DeprecatedValueList.h */,
                                F587853C02DE375901EA4122 /* DeprecatedValueListImpl.cpp */,
                                F587853B02DE375901EA4122 /* DeprecatedValueListImpl.h */,
+                               93CCF7D4033BD43C008635CE /* FileButton.h */,
                                BC73E3900978CED700EDFF8A /* FloatPoint.cpp */,
                                BC73E3910978CED700EDFF8A /* FloatPoint.h */,
                                BCB16AF50979A08500467741 /* FloatRect.cpp */,
                                BC73E25C0978682700EDFF8A /* FloatSize.h */,
                                BC6D6DD009AF906600F59759 /* Font.cpp */,
                                BC6D6DD109AF906600F59759 /* Font.h */,
-                               BCF7C0B70A1687CC0032F75B /* FontCache.h */,
                                BC6DABF20A19015700E5CD14 /* FontCache.cpp */,
-                               BCEB377509B7BB0D00CB38B1 /* FontFallbackList.h */,
+                               BCF7C0B70A1687CC0032F75B /* FontCache.h */,
                                BCC089190A1C4652006189A6 /* FontData.cpp */,
-                               BCF7C0770A1680C00032F75B /* FontFallbackList.cpp */,
                                BCC47E6A09A3FE4700ADB771 /* FontDescription.h */,
+                               BCF7C0770A1680C00032F75B /* FontFallbackList.cpp */,
+                               BCEB377509B7BB0D00CB38B1 /* FontFallbackList.h */,
                                BCC47E2409A3D6F100ADB771 /* FontFamily.cpp */,
                                BCC47E2509A3D6F100ADB771 /* FontFamily.h */,
                                BCC71A120A0FF94D0014EE6E /* GlyphBuffer.h */,
-                               BC6DB3680A1A7CB700E5CD14 /* GlyphMap.h */,
                                BC6DB4730A1A90FB00E5CD14 /* GlyphMap.cpp */,
+                               BC6DB3680A1A7CB700E5CD14 /* GlyphMap.h */,
                                BCC089550A1C4CC9006189A6 /* GlyphWidthMap.cpp */,
                                BCC089290A1C4991006189A6 /* GlyphWidthMap.h */,
                                A823A75B09B6E53900B60641 /* GraphicsContext.cpp */,
                                BCF1A5EF097839600061A123 /* IntSize.h */,
                                6593923509AE4346002C531F /* KURL.cpp */,
                                6593923609AE4346002C531F /* KURL.h */,
+                               F587851302DE375901EA4122 /* ListBox.h */,
                                935207BD09BD410A00F2038D /* LocalizedStrings.h */,
                                A8239DFE09B3CF8A00B60641 /* Logging.cpp */,
                                A8239DFF09B3CF8A00B60641 /* Logging.h */,
                                93CD4FEB0995FD2A007ECC97 /* PlatformString.h */,
                                935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */,
                                A82398A509B3ACDB00B60641 /* PlugInInfoStore.h */,
+                               F587868202DE3B8601EA4122 /* PopUpButton.h */,
                                F587852B02DE375901EA4122 /* RegularExpression.cpp */,
                                F58786B302DE3B8601EA4122 /* RegularExpression.h */,
                                9385F761098D9C3100D90D24 /* Screen.h */,
+                               BC7B2AF80450824100A8000F /* ScrollBar.h */,
                                9353673E09AED79200D35CD6 /* ScrollBarMode.h */,
                                BC6D6E2509AF943500F59759 /* ScrollView.h */,
                                BCFB2F3F097A24B500BA703D /* SegmentedString.cpp */,
                                BCFB2F40097A24B500BA703D /* SegmentedString.h */,
                                BCFB2E830979FD4F00BA703D /* Shared.h */,
                                93309EA0099EB78C0056E581 /* SharedTimer.h */,
+                               BC86FB8D061F5C23006BB822 /* Slider.h */,
+                               F587866202DE3B1101EA4122 /* SSLKeyGenerator.h */,
                                9352071709BD3BA500F2038D /* StaticConstructors.h */,
                                657BD74909AFDC54005A2056 /* StreamingTextDecoder.cpp */,
                                657BD74A09AFDC54005A2056 /* StreamingTextDecoder.h */,
                                93CD4FDD0995F9EA007ECC97 /* StringImpl.h */,
                                93E62D990985F41600E1B5E3 /* SystemTime.h */,
                                9352071809BD3BA500F2038D /* TextBoundaries.h */,
+                               F58786BE02DE3B8601EA4122 /* TextBox.h */,
                                9353686A09AF78F600D35CD6 /* TextDirection.h */,
                                657BD74B09AFDC54005A2056 /* TextEncoding.cpp */,
                                657BD74C09AFDC54005A2056 /* TextEncoding.h */,
+                               F587869802DE3B8601EA4122 /* TextField.h */,
                                F587853902DE375901EA4122 /* TextStream.cpp */,
                                F58786BF02DE3B8601EA4122 /* TextStream.h */,
                                93309EA1099EB78C0056E581 /* Timer.cpp */,
                        path = xml;
                        sourceTree = "<group>";
                };
-               F523D15002DE4271018635CA /* other */ = {
-                       isa = PBXGroup;
-                       children = (
-                               BEF7EEA005FF8F0D009717EE /* WebCoreEditCommand.h */,
-                               BEF7EEA105FF8F0D009717EE /* WebCoreEditCommand.mm */,
-                               93CCF7D4033BD43C008635CE /* FileButton.h */,
-                               93CCF7D5033BD43C008635CE /* FileButton.mm */,
-                               93B641F206E28C5C0055F610 /* FormDataMac.h */,
-                               93B641F106E28C5C0055F610 /* FormDataMac.mm */,
-                               F587851702DE375901EA4122 /* LoaderFunctions.h */,
-                               F587850302DE375901EA4122 /* LoaderFunctions.mm */,
-                               9394E0A403AA5BBE008635CE /* WebCorePageState.h */,
-                               9394E0A503AA5BBE008635CE /* WebCorePageState.mm */,
-                               93386B90037045B3008635CE /* WebCoreResourceLoaderImp.h */,
-                               93386B91037045B3008635CE /* WebCoreResourceLoaderImp.mm */,
-                               BC7B2AF80450824100A8000F /* WebCoreScrollBar.h */,
-                               BC7B2AF90450824100A8000F /* WebCoreScrollBar.mm */,
-                       );
-                       name = other;
-                       sourceTree = "<group>";
-               };
                F523D18402DE42E8018635CA /* css */ = {
                        isa = PBXGroup;
                        children = (
                F58785E802DE377601EA4122 /* kwq */ = {
                        isa = PBXGroup;
                        children = (
-                               55998A57052B598F0017A6C1 /* Accessibility */,
-                               F587871802DE3B8801EA4122 /* qt */,
-                               F587865F02DE3A9C01EA4122 /* kio */,
-                               F587864302DE3A1601EA4122 /* khtml */,
-                               F523D15002DE4271018635CA /* other */,
+                               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>";
                };
-               F587864302DE3A1601EA4122 /* khtml */ = {
-                       isa = PBXGroup;
-                       children = (
-                               F587863A02DE3A1401EA4122 /* Settings.h */,
-                       );
-                       name = khtml;
-                       sourceTree = "<group>";
-               };
-               F587865F02DE3A9C01EA4122 /* kio */ = {
-                       isa = PBXGroup;
-                       children = (
-                               F587864902DE3A9A01EA4122 /* CacheControl.h */,
-                               F587866202DE3B1101EA4122 /* SSLKeyGenerator.h */,
-                               84B2B24F056BF15F00D2B771 /* SSLKeyGenerator.mm */,
-                       );
-                       name = kio;
-                       sourceTree = "<group>";
-               };
-               F587871802DE3B8801EA4122 /* qt */ = {
-                       isa = PBXGroup;
-                       children = (
-                               F587868202DE3B8601EA4122 /* PopUpButton.h */,
-                               F58784D202DE375901EA4122 /* PopUpButton.mm */,
-                               F587869802DE3B8601EA4122 /* TextField.h */,
-                               F587851202DE375901EA4122 /* TextField.mm */,
-                               F587851302DE375901EA4122 /* ListBox.h */,
-                               F587851402DE375901EA4122 /* ListBox.mm */,
-                               F58786AD02DE3B8601EA4122 /* DeprecatedPtrQueue.h */,
-                               BC86FB8D061F5C23006BB822 /* WebCoreSlider.h */,
-                               BC86FB8E061F5C23006BB822 /* WebCoreSlider.mm */,
-                               F58786BE02DE3B8601EA4122 /* TextBox.h */,
-                               F587853802DE375901EA4122 /* TextBox.mm */,
-                               A85D7A8C0879EC64006A9172 /* AffineTransform.cpp */,
-                               A85D7A8D0879EC64006A9172 /* AffineTransform.h */,
-                       );
-                       name = qt;
-                       sourceTree = "<group>";
-               };
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
                                93F1992F08245E59001E9ABC /* Cursor.h in Headers */,
                                93F1993908245E59001E9ABC /* FileButton.h in Headers */,
                                93F1994F08245E59001E9ABC /* Settings.h in Headers */,
-                               93F1995008245E59001E9ABC /* CacheControl.h in Headers */,
+                               93F1995008245E59001E9ABC /* CachePolicy.h in Headers */,
                                93F1995408245E59001E9ABC /* JavaAppletWidget.h in Headers */,
                                93F1996308245E59001E9ABC /* SSLKeyGenerator.h in Headers */,
                                93F1996B08245E59001E9ABC /* TextField.h in Headers */,
                                93F199AD08245E59001E9ABC /* WebCoreResourceLoader.h in Headers */,
                                93F199AF08245E59001E9ABC /* WebCoreSettings.h in Headers */,
                                93F199B308245E59001E9ABC /* WebCoreViewFactory.h in Headers */,
-                               93F199B808245E59001E9ABC /* WebCoreScrollBar.h in Headers */,
+                               93F199B808245E59001E9ABC /* ScrollBar.h in Headers */,
                                93F199BB08245E59001E9ABC /* WebCoreKeyboardAccess.h in Headers */,
                                93F199BC08245E59001E9ABC /* WebCoreAXObject.h in Headers */,
                                93F199BD08245E59001E9ABC /* AccessibilityObjectCache.h in Headers */,
                                93F199CF08245E59001E9ABC /* AtomicStringList.h in Headers */,
                                93F199D508245E59001E9ABC /* WebCoreEditCommand.h in Headers */,
                                93F199DE08245E59001E9ABC /* Position.h in Headers */,
-                               93F199E008245E59001E9ABC /* WebCoreSlider.h in Headers */,
+                               93F199E008245E59001E9ABC /* Slider.h in Headers */,
                                93F199E508245E59001E9ABC /* HTMLCanvasElement.h in Headers */,
                                93F199E708245E59001E9ABC /* ClipboardMac.h in Headers */,
                                93F199EC08245E59001E9ABC /* XSLStyleSheet.h in Headers */,
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               93F19A1708245E59001E9ABC /* PopUpButton.mm in Sources */,
+                               93F19A1708245E59001E9ABC /* PopUpButtonMac.mm in Sources */,
                                93F19A1808245E59001E9ABC /* DeprecatedCString.cpp in Sources */,
                                93F19A2608245E59001E9ABC /* CursorMac.mm in Sources */,
                                93F19A2E08245E59001E9ABC /* JavaAppletWidget.mm in Sources */,
-                               93F19A3108245E59001E9ABC /* LoaderFunctions.mm in Sources */,
-                               93F19A3A08245E59001E9ABC /* TextField.mm in Sources */,
-                               93F19A3B08245E59001E9ABC /* ListBox.mm in Sources */,
+                               93F19A3108245E59001E9ABC /* LoaderFunctionsMac.mm in Sources */,
+                               93F19A3A08245E59001E9ABC /* TextFieldMac.mm in Sources */,
+                               93F19A3B08245E59001E9ABC /* ListBoxMac.mm in Sources */,
                                93F19A3C08245E59001E9ABC /* DeprecatedPtrListImpl.cpp in Sources */,
                                93F19A3F08245E59001E9ABC /* WebCoreTextField.mm in Sources */,
                                93F19A4A08245E59001E9ABC /* RegularExpression.cpp in Sources */,
                                93F19A5108245E59001E9ABC /* WebCoreTextArea.mm in Sources */,
-                               93F19A5308245E59001E9ABC /* TextBox.mm in Sources */,
+                               93F19A5308245E59001E9ABC /* TextBoxMac.mm in Sources */,
                                93F19A5408245E59001E9ABC /* TextStream.cpp in Sources */,
                                93F19A5608245E59001E9ABC /* DeprecatedValueListImpl.cpp in Sources */,
                                93F19A5F08245E59001E9ABC /* WebCoreViewFactory.m in Sources */,
                                93F19AC208245E59001E9ABC /* WebCoreSettings.mm in Sources */,
                                93F19AC608245E59001E9ABC /* WebCoreEncodings.mm in Sources */,
                                93F19AC808245E59001E9ABC /* WebCoreHistory.m in Sources */,
-                               93F19ACC08245E59001E9ABC /* FileButton.mm in Sources */,
+                               93F19ACC08245E59001E9ABC /* FileButtonMac.mm in Sources */,
                                93F19ACD08245E59001E9ABC /* WebCoreResourceLoaderImp.mm in Sources */,
                                93F19AD208245E59001E9ABC /* WebCorePageState.mm in Sources */,
                                93F19AD508245E59001E9ABC /* RenderTreeAsText.cpp in Sources */,
-                               93F19ADC08245E59001E9ABC /* WebCoreScrollBar.mm in Sources */,
+                               93F19ADC08245E59001E9ABC /* ScrollBarMac.mm in Sources */,
                                93F19ADF08245E59001E9ABC /* WebCoreAXObject.mm in Sources */,
                                93F19AE008245E59001E9ABC /* AccessibilityObjectCache.mm in Sources */,
                                93F19AE108245E59001E9ABC /* BlockExceptions.mm in Sources */,
                                93F19AE508245E59001E9ABC /* WebCoreKeyGenerator.m in Sources */,
-                               93F19AE608245E59001E9ABC /* SSLKeyGenerator.mm in Sources */,
+                               93F19AE608245E59001E9ABC /* SSLKeyGeneratorMac.mm in Sources */,
                                93F19AF708245E59001E9ABC /* WebCoreEditCommand.mm in Sources */,
                                93F19AF808245E59001E9ABC /* Position.cpp in Sources */,
-                               93F19AFA08245E59001E9ABC /* WebCoreSlider.mm in Sources */,
+                               93F19AFA08245E59001E9ABC /* SliderMac.mm in Sources */,
                                93F19AFD08245E59001E9ABC /* HTMLCanvasElement.cpp in Sources */,
                                93F19AFF08245E59001E9ABC /* ClipboardMac.mm in Sources */,
                                93F19B0308245E59001E9ABC /* XSLStyleSheet.cpp in Sources */,
                                ABDDFE7B0A5C6E7000A3E11D /* RenderPopupMenu.cpp in Sources */,
                                ABDDFE7E0A5C6E7000A3E11D /* RenderPopupMenuMac.mm in Sources */,
                                85217E020A5ECD4700DB8D00 /* XSLImportRule.cpp in Sources */,
+                               93CF35AA0A6169F700543E52 /* AffineTransformCG.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
index 0dc585d..56b5a58 100644 (file)
@@ -85,7 +85,6 @@
 
 using namespace std;
 using namespace KJS::Bindings;
-using namespace KIO;
 
 using KJS::JSLock;
 using KJS::PausedTimeouts;
index 381e042..ed203ae 100644 (file)
@@ -28,7 +28,7 @@
 #define Element_h
 
 #include "Attr.h"
-#include "WebCoreScrollBar.h"
+#include "ScrollBar.h"
 
 namespace WebCore {
 
index d4e39ad..46cb42f 100644 (file)
@@ -77,7 +77,7 @@ void HTMLImageLoader::updateFromElement()
     CachedImage *newImage = 0;
     if (!attr.isEmpty()) {
         if (m_loadManually) {
-            newImage = new CachedImage(doc->docLoader(), parseURL(attr), KIO::CC_Verify, 0);
+            newImage = new CachedImage(doc->docLoader(), parseURL(attr), CachePolicyVerify, 0);
             doc->docLoader()->m_docObjects.set(newImage->url(), newImage);
         } else
             newImage = doc->docLoader()->requestImage(parseURL(attr));
index e8510d3..8bcfb7e 100644 (file)
@@ -134,11 +134,11 @@ CachedImage* Cache::requestImage(DocLoader* dl, const String& url, bool reload,
 
 CachedImage* Cache::requestImage(DocLoader* dl, const KURL& url, bool reload, time_t expireDate)
 {
-    KIO::CacheControl cachePolicy;
+    CachePolicy cachePolicy;
     if (dl)
         cachePolicy = dl->cachePolicy();
     else
-        cachePolicy = KIO::CC_Verify;
+        cachePolicy = CachePolicyVerify;
 
     // Checking if the URL is malformed is lots of extra work for little benefit.
 
@@ -182,13 +182,13 @@ CachedCSSStyleSheet* Cache::requestStyleSheet(DocLoader* dl, const String& url,
 {
     // this brings the _url to a standard form...
     KURL kurl;
-    KIO::CacheControl cachePolicy;
+    CachePolicy cachePolicy;
     if (dl) {
         kurl = dl->m_doc->completeURL(url.deprecatedString());
         cachePolicy = dl->cachePolicy();
     } else {
         kurl = url.deprecatedString();
-        cachePolicy = KIO::CC_Verify;
+        cachePolicy = CachePolicyVerify;
     }
 
     // Checking if the URL is malformed is lots of extra work for little benefit.
@@ -232,13 +232,13 @@ CachedScript* Cache::requestScript(DocLoader* dl, const String& url, bool reload
 {
     // this brings the _url to a standard form...
     KURL kurl;
-    KIO::CacheControl cachePolicy;
+    CachePolicy cachePolicy;
     if (dl) {
         kurl = dl->m_doc->completeURL(url.deprecatedString());
         cachePolicy = dl->cachePolicy();
     } else {
         kurl = url.deprecatedString();
-        cachePolicy = KIO::CC_Verify;
+        cachePolicy = CachePolicyVerify;
     }
 
     // Checking if the URL is malformed is lots of extra work for little benefit.
@@ -284,14 +284,14 @@ CachedXSLStyleSheet* Cache::requestXSLStyleSheet(DocLoader* dl, const String& ur
 {
     // this brings the _url to a standard form...
     KURL kurl;
-    KIO::CacheControl cachePolicy;
+    CachePolicy cachePolicy;
     if (dl) {
         kurl = dl->m_doc->completeURL(url.deprecatedString());
         cachePolicy = dl->cachePolicy();
     }
     else {
         kurl = url.deprecatedString();
-        cachePolicy = KIO::CC_Verify;
+        cachePolicy = CachePolicyVerify;
     }
     
     // Checking if the URL is malformed is lots of extra work for little benefit.
@@ -337,13 +337,13 @@ CachedXBLDocument* Cache::requestXBLDocument(DocLoader* dl, const String& url, b
 {
     // this brings the _url to a standard form...
     KURL kurl;
-    KIO::CacheControl cachePolicy;
+    CachePolicy cachePolicy;
     if (dl) {
         kurl = dl->m_doc->completeURL(url.deprecatedString());
         cachePolicy = dl->cachePolicy();
     } else {
         kurl = url.deprecatedString();
-        cachePolicy = KIO::CC_Verify;
+        cachePolicy = CachePolicyVerify;
     }
     
     // Checking if the URL is malformed is lots of extra work for little benefit.
index b57fae1..af26000 100644 (file)
@@ -27,9 +27,9 @@
 #ifndef Cache_h
 #define Cache_h
 
-#include "PlatformString.h"
-#include "CacheControl.h"
+#include "CachePolicy.h"
 #include "DeprecatedPtrList.h"
+#include "PlatformString.h"
 #include <wtf/HashSet.h>
 
 class KURL;
diff --git a/WebCore/loader/CachePolicy.h b/WebCore/loader/CachePolicy.h
new file mode 100644 (file)
index 0000000..16af78a
--- /dev/null
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2003, 2006 Apple Computer, Inc.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+#ifndef CachePolicy_h
+#define CachePolicy_h
+
+namespace WebCore {
+
+    enum CachePolicy {
+        CachePolicyCache,
+        CachePolicyVerify,
+        CachePolicyRefresh,
+        CachePolicyReload
+    };
+
+}
+
+#endif
index 1bc967c..4b772e9 100644 (file)
@@ -38,8 +38,8 @@
 
 namespace WebCore {
 
-CachedCSSStyleSheet::CachedCSSStyleSheet(DocLoader* dl, const String &url, KIO::CacheControl _cachePolicy, time_t _expireDate, const DeprecatedString& charset)
-    : CachedObject(url, CSSStyleSheet, _cachePolicy, _expireDate)
+CachedCSSStyleSheet::CachedCSSStyleSheet(DocLoader* dl, const String &url, CachePolicy cachePolicy, time_t _expireDate, const DeprecatedString& charset)
+    : CachedObject(url, CSSStyleSheet, cachePolicy, _expireDate)
     , m_encoding(charset.latin1())
 {
     // It's css we want.
@@ -52,7 +52,7 @@ CachedCSSStyleSheet::CachedCSSStyleSheet(DocLoader* dl, const String &url, KIO::
 }
 
 CachedCSSStyleSheet::CachedCSSStyleSheet(const String &url, const DeprecatedString &stylesheet_data)
-    : CachedObject(url, CSSStyleSheet, KIO::CC_Verify, 0, stylesheet_data.length())
+    : CachedObject(url, CSSStyleSheet, CachePolicyVerify, 0, stylesheet_data.length())
     , m_encoding(InvalidEncoding)
 {
     m_loading = false;
index 26a8296..68ef0cb 100644 (file)
@@ -39,7 +39,7 @@ namespace WebCore
     class CachedCSSStyleSheet : public CachedObject
     {
     public:
-        CachedCSSStyleSheet(DocLoader*, const String& URL, KIO::CacheControl, time_t expireDate, const DeprecatedString& charset);
+        CachedCSSStyleSheet(DocLoader*, const String& URL, CachePolicy, time_t expireDate, const DeprecatedString& charset);
         CachedCSSStyleSheet(const String& URL, const DeprecatedString& stylesheetData);
         virtual ~CachedCSSStyleSheet();
 
index c2842dc..ccbc253 100644 (file)
@@ -42,8 +42,8 @@ using std::max;
 
 namespace WebCore {
 
-CachedImage::CachedImage(DocLoader* dl, const String &url, KIO::CacheControl _cachePolicy, time_t _expireDate)
-    : CachedObject(url, ImageResource, _cachePolicy, _expireDate)
+CachedImage::CachedImage(DocLoader* dl, const String &url, CachePolicy cachePolicy, time_t _expireDate)
+    : CachedObject(url, ImageResource, cachePolicy, _expireDate)
     , m_dataSize(0)
 {
     m_image = 0;
index b83a6f2..b91f0c7 100644 (file)
@@ -41,7 +41,7 @@ class Image;
 
 class CachedImage : public CachedObject, public ImageAnimationObserver {
 public:
-    CachedImage(DocLoader*, const String& url, KIO::CacheControl cachePolicy, time_t expireDate);
+    CachedImage(DocLoader*, const String& url, CachePolicy, time_t expireDate);
     virtual ~CachedImage();
 
     Image* image() const;
index 943976f..309013b 100644 (file)
@@ -29,8 +29,8 @@
 #define CachedObject_h
 
 #include "DeprecatedString.h"
+#include "CachePolicy.h"
 #include "PlatformString.h"
-#include "CacheControl.h"
 #include <wtf/HashSet.h>
 #include <wtf/Vector.h>
 #include <time.h>
@@ -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, KIO::CacheControl cachePolicy, time_t expireDate, int size = 0)
+        CachedObject(const String& URL, Type type, CachePolicy cachePolicy, time_t expireDate, int size = 0)
         {
             m_url = URL;
             m_type = type;
@@ -142,7 +142,7 @@ namespace WebCore
          */
         void setFree(bool b) { m_free = b; }
 
-        KIO::CacheControl cachePolicy() const { return m_cachePolicy; }
+        CachePolicy cachePolicy() const { return m_cachePolicy; }
 
         void setRequest(Request*);
 
@@ -186,7 +186,7 @@ namespace WebCore
     
     protected:
         time_t m_expireDate;
-        KIO::CacheControl m_cachePolicy;
+        CachePolicy m_cachePolicy;
         bool m_free : 1;
         bool m_deleted : 1;
         bool m_loading : 1;
diff --git a/WebCore/loader/CachedResource.cpp b/WebCore/loader/CachedResource.cpp
deleted file mode 100644 (file)
index 2477070..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-    This file is part of the KDE libraries
-
-    Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
-    Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
-    Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
-    Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-    Boston, MA 02111-1307, USA.
-
-    This class provides all functionality needed for loading images, style sheets and html
-    pages from the web. It has a memory cache for these objects.
-*/
-
-#include "config.h"
-#include "CachedObject.h"
-
-#include "Cache.h"
-#include <KURL.h>
-
-namespace WebCore {
-
-CachedObject::~CachedObject()
-{
-    if (m_deleted)
-        abort();
-    Cache::removeFromLRUList(this);
-    m_deleted = true;
-#if __APPLE__
-    setResponse(0);
-    setAllData(0);
-#endif
-}
-
-void CachedObject::finish()
-{
-    if (m_size > Cache::maxCacheableObjectSize())
-        m_status = Uncacheable;
-    else
-        m_status = Cached;
-    KURL url(m_url.deprecatedString());
-    if (m_expireDateChanged && url.protocol().startsWith("http"))
-        m_expireDateChanged = false;
-}
-
-void CachedObject::setExpireDate(time_t _expireDate, bool changeHttpCache)
-{
-    if ( _expireDate == m_expireDate)
-        return;
-
-    if (m_status == Uncacheable || m_status == Cached)
-    {
-        finish();
-    }
-    m_expireDate = _expireDate;
-    if (changeHttpCache && m_expireDate)
-       m_expireDateChanged = true;
-}
-
-bool CachedObject::isExpired() const
-{
-    if (!m_expireDate) return false;
-    time_t now = time(0);
-    return (difftime(now, m_expireDate) >= 0);
-}
-
-void CachedObject::setRequest(Request *_request)
-{
-    if ( _request && !m_request )
-        m_status = Pending;
-    m_request = _request;
-    if (canDelete() && m_free)
-        delete this;
-    else if (allowInLRUList())
-        Cache::insertInLRUList(this);
-}
-
-void CachedObject::ref(CachedObjectClient *c)
-{
-    m_clients.add(c);
-    Cache::removeFromLRUList(this);
-    increaseAccessCount();
-}
-
-void CachedObject::deref(CachedObjectClient *c)
-{
-    m_clients.remove(c);
-    if (allowInLRUList())
-        Cache::insertInLRUList(this);
-}
-
-void CachedObject::setSize(int size)
-{
-    bool sizeChanged = Cache::adjustSize(this, size - m_size);
-
-    // The object must now be moved to a different queue, since its size has been changed.
-    if (sizeChanged && allowInLRUList())
-        Cache::removeFromLRUList(this);
-
-    m_size = size;
-    
-    if (sizeChanged && allowInLRUList())
-        Cache::insertInLRUList(this);
-}
-
-}
diff --git a/WebCore/loader/CachedResource.h b/WebCore/loader/CachedResource.h
deleted file mode 100644 (file)
index af5e995..0000000
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
-    This file is part of the KDE libraries
-
-    Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
-    Copyright (C) 2001 Dirk Mueller <mueller@kde.org>
-    Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-    Boston, MA 02111-1307, USA.
-
-    This class provides all functionality needed for loading images, style sheets and html
-    pages from the web. It has a memory cache for these objects.
-*/
-
-#ifndef CachedObject_h
-#define CachedObject_h
-
-#include "PlatformString.h"
-#include "CacheControl.h"
-#include <wtf/HashSet.h>
-#include <time.h>
-
-#if __OBJC__
-@class NSData;
-@class NSURLResponse;
-#else
-class NSData;
-class NSURLResponse;
-#endif
-
-namespace WebCore
-{
-    class CachedObjectClient;
-    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.
-     *
-     * This class also does the actual communication with kio and loads the file.
-     */
-    class CachedObject
-    {
-    public:
-        enum Type {
-            ImageResource,
-            CSSStyleSheet,
-            Script
-#ifdef KHTML_XSLT
-            , XSLStyleSheet
-#endif
-#ifndef KHTML_NO_XBL
-            , XBL
-#endif
-        };
-
-        enum Status {
-            NotCached,    // this URL is not cached
-            Unknown,      // let cache decide what to do with it
-            New,          // inserting new item
-            Pending,      // only partially loaded
-            Persistent,   // never delete this
-            Cached,       // regular case
-            Uncacheable   // too big to be cached, will be destroyed as soon as possible
-        };
-
-        CachedObject(const String& URL, Type type, KIO::CacheControl cachePolicy, time_t expireDate, int size = 0)
-        {
-            m_url = URL;
-            m_type = type;
-            m_status = Pending;
-            m_size = size;
-            m_free = false;
-            m_cachePolicy = cachePolicy;
-            m_request = 0;
-#if __APPLE__
-            m_response = 0;
-            m_allData = 0;
-#endif
-            m_expireDate = expireDate;
-            m_deleted = false;
-            m_expireDateChanged = false;
-            
-            m_accessCount = 0;
-            
-            m_nextInLRUList = 0;
-            m_prevInLRUList = 0;
-        }
-        virtual ~CachedObject();
-
-        virtual void setCharset(const DeprecatedString&) {}
-        virtual void data(Vector<char>&, bool atEnd) = 0;
-        virtual void error() = 0;
-
-        const String &url() const { return m_url; }
-        Type type() const { return m_type; }
-
-        virtual void ref(CachedObjectClient*);
-        virtual void deref(CachedObjectClient*);
-
-        int count() const { return m_clients.size(); }
-
-        Status status() const { return m_status; }
-
-        int size() const { return m_size; }
-
-        bool isLoaded() const { return !m_loading; }
-
-        virtual bool isImage() const { return false; }
-
-        int accessCount() const { return m_accessCount; }
-        void increaseAccessCount() { m_accessCount++; }
-    
-        /**
-         * computes the status of an object after loading.
-         * the result depends on the objects size and the size of the cache
-         * also updates the expire date on the cache entry file
-         */
-        void finish();
-
-        /**
-         * Called by the cache if the object has been removed from the cache dict
-         * while still being referenced. This means the object should kill itself
-         * if its reference counter drops down to zero.
-         */
-        void setFree(bool b) { m_free = b; }
-
-        KIO::CacheControl cachePolicy() const { return m_cachePolicy; }
-
-        void setRequest(Request*);
-
-#if __APPLE__
-        NSURLResponse* response() const { return m_response; }
-        void setResponse(NSURLResponse*);
-        NSData* allData() const { return m_allData; }
-        void setAllData(NSData*);
-#endif
-
-        bool canDelete() const { return m_clients.isEmpty() && !m_request; }
-
-        void setExpireDate(time_t expireDate, bool changeHttpCache);
-
-        bool isExpired() const;
-
-        virtual bool schedule() const { return false; }
-
-        // List of acceptable MIME types seperated by ",".
-        // A MIME type may contain a wildcard, e.g. "text/*".
-        DeprecatedString accept() const { return m_accept; }
-        void setAccept(const DeprecatedString& accept) { m_accept = accept; }
-
-    protected:
-        void setSize(int size);
-
-        HashSet<CachedObjectClient*> m_clients;
-
-        String m_url;
-        DeprecatedString m_accept;
-        Request *m_request;
-#if __APPLE__
-        NSURLResponse *m_response;
-        NSData *m_allData;
-#endif
-        Type m_type;
-        Status m_status;
-    private:
-        int m_size;
-        int m_accessCount;
-    
-    protected:
-        time_t m_expireDate;
-        KIO::CacheControl m_cachePolicy;
-        bool m_free : 1;
-        bool m_deleted : 1;
-        bool m_loading : 1;
-        bool m_expireDateChanged : 1;
-
-    private:
-        bool allowInLRUList() const { return canDelete() && status() != Persistent; }
-
-        CachedObject *m_nextInLRUList;
-        CachedObject *m_prevInLRUList;
-        friend class Cache;
-    };
-
-}
-
-#endif
diff --git a/WebCore/loader/CachedResourceClient.h b/WebCore/loader/CachedResourceClient.h
deleted file mode 100644 (file)
index 9e9ffdf..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-    This file is part of the KDE libraries
-
-    Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
-    Copyright (C) 2001 Dirk Mueller <mueller@kde.org>
-    Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-    Boston, MA 02111-1307, USA.
-
-    This class provides all functionality needed for loading images, style sheets and html
-    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 KHTML_NO_XBL
-namespace XBL {
-    class XBLDocument;
-}
-#endif
-
-namespace WebCore {
-
-    class CachedObject;
-    class CachedImage;
-    class String;
-    class Image;
-    class IntRect;
-
-    /**
-     * @internal
-     *
-     * a client who wants to load stylesheets, images or scripts from the web has to
-     * inherit from this class and overload one of the 3 functions
-     *
-     */
-    class CachedObjectClient
-    {
-    public:
-        virtual ~CachedObjectClient() { }
-
-        // Called whenever a frame of an image changes, either because we got more data from the network or
-        // because we are animating.
-        virtual void imageChanged(CachedImage*) { };
-        
-        // Called to find out if this client wants to actually display the image.  Used to tell when we
-        // can halt animation.  Content nodes that hold image refs for example would not render the image,
-        // but RenderImages would (assuming they have visibility: visible and their render tree isn't hidden
-        // e.g., in the b/f cache or in a background tab).
-        virtual bool willRenderImage(CachedImage*) { return false; }
-
-        virtual void setStyleSheet(const String& /*URL*/, const String& /*sheet*/) { }
-
-#ifndef KHTML_NO_XBL
-        virtual void setXBLDocument(const String& /*URL*/, XBL::XBLDocument*) { }
-#endif
-
-        virtual void notifyFinished(CachedObject*) { }
-    };
-
-}
-
-#endif
diff --git a/WebCore/loader/CachedResourceClientWalker.cpp b/WebCore/loader/CachedResourceClientWalker.cpp
deleted file mode 100644 (file)
index 25bd88c..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-    This file is part of the KDE libraries
-
-    Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
-    Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
-    Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
-    Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-    Boston, MA 02111-1307, USA.
-
-    This class provides all functionality needed for loading images, style sheets and html
-    pages from the web. It has a memory cache for these objects.
-*/
-
-#include "config.h"
-#include "CachedObjectClientWalker.h"
-
-namespace WebCore {
-
-CachedObjectClient* CachedObjectClientWalker::next()
-{
-    while (!m_remaining.isEmpty()) {
-        CachedObjectClient* next = *m_remaining.begin();
-        m_remaining.remove(next);
-        if (m_clients.contains(next))
-            return next;
-    }
-    return 0;
-}
-
-}
diff --git a/WebCore/loader/CachedResourceClientWalker.h b/WebCore/loader/CachedResourceClientWalker.h
deleted file mode 100644 (file)
index 273668d..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-    This file is part of the KDE libraries
-
-    Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
-    Copyright (C) 2001 Dirk Mueller <mueller@kde.org>
-    Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-    Boston, MA 02111-1307, USA.
-
-    This class provides all functionality needed for loading images, style sheets and html
-    pages from the web. It has a memory cache for these objects.
-*/
-
-#ifndef CachedObjectClientWalker_h
-#define CachedObjectClientWalker_h
-
-#include <wtf/HashSet.h>
-
-namespace WebCore {
-
-    class CachedObjectClient;
-
-    typedef HashSet<CachedObjectClient*> CachedObjectClientSet;
-
-    // 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 {
-    public:
-        CachedObjectClientWalker(const CachedObjectClientSet& clients) : m_clients(clients), m_remaining(clients) { }
-        CachedObjectClient* next();
-    private:
-        const CachedObjectClientSet& m_clients;
-        CachedObjectClientSet m_remaining;
-    };
-
-}
-
-#endif
index 9c5756d..c071a89 100644 (file)
@@ -37,8 +37,8 @@
 
 namespace WebCore {
 
-CachedScript::CachedScript(DocLoader* dl, const String &url, KIO::CacheControl _cachePolicy, time_t _expireDate, const DeprecatedString& charset)
-    : CachedObject(url, Script, _cachePolicy, _expireDate)
+CachedScript::CachedScript(DocLoader* dl, const String &url, CachePolicy cachePolicy, time_t _expireDate, const DeprecatedString& charset)
+    : CachedObject(url, Script, cachePolicy, _expireDate)
     , m_encoding(charset.latin1())
 {
     // It's javascript we want.
@@ -54,7 +54,7 @@ CachedScript::CachedScript(DocLoader* dl, const String &url, KIO::CacheControl _
 }
 
 CachedScript::CachedScript(const String &url, const DeprecatedString &script_data)
-    : CachedObject(url, Script, KIO::CC_Verify, 0, script_data.length())
+    : CachedObject(url, Script, CachePolicyVerify, 0, script_data.length())
     , m_encoding(InvalidEncoding)
 {
     m_errorOccurred = false;
index 2ed371f..ec0483e 100644 (file)
@@ -37,7 +37,7 @@ namespace WebCore {
 
     class CachedScript : public CachedObject {
     public:
-        CachedScript(DocLoader*, const String& URL, KIO::CacheControl, time_t expireDate, const DeprecatedString& charset);
+        CachedScript(DocLoader*, const String& URL, CachePolicy, time_t expireDate, const DeprecatedString& charset);
         CachedScript(const String& URL, const DeprecatedString& scriptData);
         virtual ~CachedScript();
 
index 8f6ef05..e0ecc45 100644 (file)
@@ -40,8 +40,8 @@
 
 namespace WebCore {
 
-CachedXBLDocument::CachedXBLDocument(DocLoader* dl, const String &url, KIO::CacheControl _cachePolicy, time_t _expireDate)
-: CachedObject(url, XBL, _cachePolicy, _expireDate), m_document(0)
+CachedXBLDocument::CachedXBLDocument(DocLoader* dl, const String &url, CachePolicy cachePolicy, time_t _expireDate)
+: CachedObject(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");
index 54f81f9..6655932 100644 (file)
@@ -42,7 +42,7 @@ namespace WebCore {
     class CachedXBLDocument : public CachedObject
     {
     public:
-        CachedXBLDocument(DocLoader* dl, const String& url, KIO::CacheControl cachePolicy, time_t _expireDate);
+        CachedXBLDocument(DocLoader*, const String& url, CachePolicy, time_t expireDate);
         virtual ~CachedXBLDocument();
         
         XBL::XBLDocument* document() const { return m_document; }
@@ -65,6 +65,6 @@ namespace WebCore {
 
 #endif
 
-};
+}
 
 #endif
index f14a030..6b740fd 100644 (file)
@@ -40,8 +40,8 @@ namespace WebCore {
 
 #ifdef KHTML_XSLT
 
-CachedXSLStyleSheet::CachedXSLStyleSheet(DocLoader* dl, const String &url, KIO::CacheControl _cachePolicy, time_t _expireDate)
-: CachedObject(url, XSLStyleSheet, _cachePolicy, _expireDate)
+CachedXSLStyleSheet::CachedXSLStyleSheet(DocLoader* dl, const String &url, CachePolicy cachePolicy, time_t _expireDate)
+    : CachedObject(url, XSLStyleSheet, cachePolicy, _expireDate)
 {
     // It's XML we want.
     // FIXME: This should accept more general xml formats */*+xml, image/svg+xml for example.
index 9ababa8..9e5435e 100644 (file)
@@ -39,7 +39,7 @@ namespace WebCore {
 #ifdef KHTML_XSLT
     class CachedXSLStyleSheet : public CachedObject {
     public:
-        CachedXSLStyleSheet(DocLoader*, const String& url, KIO::CacheControl cachePolicy, time_t expireDate);
+        CachedXSLStyleSheet(DocLoader*, const String& url, CachePolicy, time_t expireDate);
 
         const String& sheet() const { return m_sheet; }
         
index 6b087a6..a967389 100644 (file)
@@ -42,7 +42,7 @@ namespace WebCore {
 
 DocLoader::DocLoader(Frame *frame, Document* doc)
 {
-    m_cachePolicy = KIO::CC_Verify;
+    m_cachePolicy = CachePolicyVerify;
     m_expireDate = 0;
     m_bautoloadImages = true;
     m_frame = frame;
@@ -66,7 +66,7 @@ void DocLoader::setExpireDate(time_t _expireDate)
 bool DocLoader::needReload(const KURL& fullURL)
 {
     bool reload = false;
-    if (m_cachePolicy == KIO::CC_Verify) {
+    if (m_cachePolicy == CachePolicyVerify) {
        if (!m_reloadedURLs.contains(fullURL.url())) {
           CachedObject* existing = Cache::get(fullURL.url());
           if (existing && existing->isExpired()) {
@@ -75,7 +75,7 @@ bool DocLoader::needReload(const KURL& fullURL)
              reload = true;
           }
        }
-    } else if ((m_cachePolicy == KIO::CC_Reload) || (m_cachePolicy == KIO::CC_Refresh)) {
+    } else if ((m_cachePolicy == CachePolicyReload) || (m_cachePolicy == CachePolicyRefresh)) {
        if (!m_reloadedURLs.contains(fullURL.url())) {
           CachedObject* existing = Cache::get(fullURL.url());
           if (existing)
@@ -92,7 +92,7 @@ CachedImage *DocLoader::requestImage(const String& url)
     KURL fullURL = m_doc->completeURL(url.deprecatedString());
 
     if (CheckIfReloading(this))
-        setCachePolicy(KIO::CC_Reload);
+        setCachePolicy(CachePolicyReload);
 
     bool reload = needReload(fullURL);
 
@@ -106,7 +106,7 @@ CachedCSSStyleSheet *DocLoader::requestStyleSheet(const String& url, const Depre
     KURL fullURL = m_doc->completeURL(url.deprecatedString());
 
     if (CheckIfReloading(this))
-        setCachePolicy(KIO::CC_Reload);
+        setCachePolicy(CachePolicyReload);
 
     bool reload = needReload(fullURL);
 
@@ -120,7 +120,7 @@ CachedScript *DocLoader::requestScript(const String& url, const DeprecatedString
     KURL fullURL = m_doc->completeURL(url.deprecatedString());
 
     if (CheckIfReloading(this))
-        setCachePolicy(KIO::CC_Reload);
+        setCachePolicy(CachePolicyReload);
 
     bool reload = needReload(fullURL);
 
@@ -135,7 +135,7 @@ CachedXSLStyleSheet* DocLoader::requestXSLStyleSheet(const String& url)
     KURL fullURL = m_doc->completeURL(url.deprecatedString());
     
     if (CheckIfReloading(this))
-        setCachePolicy(KIO::CC_Reload);
+        setCachePolicy(CachePolicyReload);
     
     bool reload = needReload(fullURL);
     
@@ -154,7 +154,7 @@ CachedXBLDocument* DocLoader::requestXBLDocument(const String& url)
     if (m_frame && m_frame->onlyLocalReferences() && fullURL.protocol() != "file") return 0;
     
     if (CheckIfReloading(this))
-        setCachePolicy(KIO::CC_Reload);
+        setCachePolicy(CachePolicyReload);
     
     bool reload = needReload(fullURL);
     
@@ -189,7 +189,7 @@ void DocLoader::setAutoloadImages(bool enable)
     }
 }
 
-void DocLoader::setCachePolicy(KIO::CacheControl cachePolicy)
+void DocLoader::setCachePolicy(CachePolicy cachePolicy)
 {
     m_cachePolicy = cachePolicy;
 }
index b26eec7..853e811 100644 (file)
 #ifndef DocLoader_h
 #define DocLoader_h
 
-#include "Settings.h"
-#include "CacheControl.h"
+#include "CachePolicy.h"
 #include "DeprecatedPtrList.h"
 #include "DeprecatedStringList.h"
-#include "wtf/HashMap.h"
+#include "Settings.h"
 #include "StringHash.h"
+#include <wtf/HashMap.h>
 
 class KURL;
 class LoaderFunctions;
@@ -71,14 +71,14 @@ namespace WebCore {
         const HashMap<String, CachedObject*>& allCachedObjects() const { return m_docObjects; }
 
         bool autoloadImages() const { return m_bautoloadImages; }
-        KIO::CacheControl cachePolicy() const { return m_cachePolicy; }
+        CachePolicy cachePolicy() const { return m_cachePolicy; }
         time_t expireDate() const { return m_expireDate; }
         Frame* frame() const { return m_frame; }
         WebCore::Document* doc() const { return m_doc; }
 
         void setExpireDate(time_t);
         void setAutoloadImages(bool);
-        void setCachePolicy(KIO::CacheControl cachePolicy);
+        void setCachePolicy(CachePolicy);
         void removeCachedObject(CachedObject*) const;
 
         void setLoadInProgress(bool);
@@ -94,7 +94,7 @@ namespace WebCore {
         DeprecatedStringList m_reloadedURLs;
         mutable HashMap<String, CachedObject*> m_docObjects;
         time_t m_expireDate;
-        KIO::CacheControl m_cachePolicy;
+        CachePolicy m_cachePolicy;
         bool m_bautoloadImages : 1;
         Frame* m_frame;
         WebCore::Document *m_doc;
index 4fe06a4..0abb0bf 100644 (file)
@@ -289,7 +289,7 @@ void Frame::stopLoading(bool sendUnload)
   d->m_bComplete = true; // to avoid calling completed() in finishedParsing() (David)
   d->m_bLoadingMainResource = false;
   d->m_bLoadEventEmitted = true; // don't want that one either
-  d->m_cachePolicy = KIO::CC_Verify; // Why here?
+  d->m_cachePolicy = CachePolicyVerify; // Why here?
 
   if (d->m_doc && d->m_doc->parsing()) {
     finishedParsing();
@@ -917,7 +917,7 @@ void Frame::scheduleRefresh(bool userGesture)
     d->m_redirectReferrer = referrer();
     d->m_redirectLockHistory = true;
     d->m_redirectUserGesture = userGesture;
-    d->m_cachePolicy = KIO::CC_Refresh;
+    d->m_cachePolicy = CachePolicyRefresh;
     stopRedirectionTimer();
     if (d->m_bComplete)
         startRedirectionTimer();
@@ -995,7 +995,7 @@ void Frame::changeLocation(const DeprecatedString& URL, const DeprecatedString&
     if (!referrer.isEmpty())
         request.setReferrer(referrer);
 
-    request.reload = (d->m_cachePolicy == KIO::CC_Reload) || (d->m_cachePolicy == KIO::CC_Refresh);
+    request.reload = (d->m_cachePolicy == CachePolicyReload) || (d->m_cachePolicy == CachePolicyRefresh);
     
     urlSelected(request, "_self");
 }
@@ -1389,7 +1389,7 @@ bool Frame::requestFrame(Element* ownerElement, const String& urlParam, const At
     if (frame) {
         ResourceRequest request(url);
         request.setReferrer(d->m_referrer);
-        request.reload = (d->m_cachePolicy == KIO::CC_Reload) || (d->m_cachePolicy == KIO::CC_Refresh);
+        request.reload = (d->m_cachePolicy == CachePolicyReload) || (d->m_cachePolicy == CachePolicyRefresh);
         frame->openURLRequest(request);
     } else
         frame = loadSubframe(ownerElement, url, frameName, d->m_referrer);
index b53d55b..ecf1b07 100644 (file)
@@ -33,7 +33,7 @@
 #include "DeprecatedStringList.h"
 #include "EditAction.h"
 #include "FrameView.h"
-#include "WebCoreScrollBar.h"
+#include "ScrollBar.h"
 #include "Node.h"
 #include "TextAffinity.h"
 #include "TextGranularity.h"
index 571b7a8..2b1381c 100644 (file)
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef khtmlpart_p_h
-#define khtmlpart_p_h
+#ifndef FramePrivate_h
+#define FramePrivate_h
 
+#include "CSSMutableStyleDeclaration.h"
+#include "CachePolicy.h"
 #include "DOMWindow.h"
+#include "Decoder.h"
 #include "EditCommand.h"
 #include "Frame.h"
 #include "FrameTree.h"
 #include "StringHash.h"
 #include "Timer.h"
 #include "kjs_proxy.h"
-#include "CacheControl.h"
 #include <wtf/HashMap.h>
-#include "CSSMutableStyleDeclaration.h"
-#include "Decoder.h"
 
 namespace WebCore {
 
@@ -74,7 +74,7 @@ namespace WebCore {
             , m_bHTTPRefresh(false)
             , m_redirectLockHistory(false)
             , m_redirectUserGesture(false)
-            , m_cachePolicy(KIO::CC_Verify)
+            , m_cachePolicy(CachePolicyVerify)
             , m_redirectionTimer(thisFrame, &Frame::redirectionTimerFired)
             , m_scheduledRedirection(noRedirectionScheduled)
             , m_delayRedirect(0)
@@ -154,7 +154,7 @@ namespace WebCore {
         KURL m_workingURL;
         ResourceRequest m_request;
 
-        KIO::CacheControl m_cachePolicy;
+        CachePolicy m_cachePolicy;
         Timer<Frame> m_redirectionTimer;
 
         RedirectionScheduled m_scheduledRedirection;
similarity index 83%
rename from WebCore/kwq/CacheControl.h
rename to WebCore/platform/AffineTransform.cpp
index b13ef45..15e83a1 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2005, 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef KIO_GLOBAL_H_
-#define KIO_GLOBAL_H_
+#include "config.h"
+#include "AffineTransform.h"
 
-namespace KIO {
-
-    enum CacheControl
-    {
-        CC_Cache,
-        CC_Verify,
-        CC_Refresh,
-        CC_Reload
-    };
+#include "FloatRect.h"
+#include "IntRect.h"
 
+bool AffineTransform::isInvertible() const
+{
+    return det() != 0.0;
 }
-
-#endif /* KIO_GLOBAL_H_ */
similarity index 88%
rename from WebCore/kwq/AffineTransform.h
rename to WebCore/platform/AffineTransform.h
index e62fac6..b3c8411 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2005, 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,7 +27,8 @@
 #define AffineTransform_h
 
 #if __APPLE__
-// FIXME: Just comment out the entire file, since its implementation is completely CG-specific.
+
+// FIXME: Implementation is currently completely CG-specific, but soon to be fixed.
 
 #include <ApplicationServices/ApplicationServices.h>
 
@@ -69,16 +70,14 @@ public:
 
     operator CGAffineTransform() const;
 
-    bool operator== (const AffineTransform &) const;
-    AffineTransform &operator*= (const AffineTransform &);
-    AffineTransform operator* (const AffineTransform &m2);
+    bool operator==(const AffineTransform&) const;
+    AffineTransform& operator*=(const AffineTransform&);
+    AffineTransform operator*(const AffineTransform&);
     
 private:
     CGAffineTransform m_transform;
 };
 
-#define AffineTransform AffineTransform
-
 #endif // __APPLE__
 
 #endif
similarity index 95%
rename from WebCore/kwq/AffineTransform.cpp
rename to WebCore/platform/cg/AffineTransformCG.cpp
index 2355a0a..110b5aa 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2005, 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -41,7 +41,8 @@ AffineTransform::AffineTransform(double a, double b, double c, double d, double
     m_transform = CGAffineTransformMake(a,b,c,d,tx,ty);
 }
 
-AffineTransform::AffineTransform(CGAffineTransform t) {
+AffineTransform::AffineTransform(CGAffineTransform t)
+{
     m_transform = t;
 }
 
@@ -107,11 +108,6 @@ double AffineTransform::det() const
     return m_transform.a * m_transform.d - m_transform.b * m_transform.c;
 }
 
-bool AffineTransform::isInvertible() const
-{
-    return det() != 0.0;
-}
-
 AffineTransform AffineTransform::invert() const
 {
     if (isInvertible())
index 3006a15..f41caef 100644 (file)
 #include "IntPoint.h"
 #include "Widget.h"
 #include "GraphicsContext.h"
-#include "WebCoreSlider.h"
+#include "Slider.h"
 #include "Cursor.h"
 #include "loader.h"
 #include "FrameView.h"
 #include "KURL.h"
-#include "WebCoreScrollBar.h"
+#include "ScrollBar.h"
 #include "JavaAppletWidget.h"
 #include "WebCoreScrollBar.h"
 #include "Path.h"
similarity index 99%
rename from WebCore/kwq/WebCoreScrollBar.mm
rename to WebCore/platform/mac/ScrollBarMac.mm
index 3dedec5..e97ea27 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #import "config.h"
-#import "WebCoreScrollBar.h"
+#import "ScrollBar.h"
 
 #import "BlockExceptions.h"
 #import "WebCoreWidgetHolder.h"
similarity index 99%
rename from WebCore/kwq/WebCoreSlider.mm
rename to WebCore/platform/mac/SliderMac.mm
index 1965ddc..30656d0 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #import "config.h"
-#import "WebCoreSlider.h"
+#import "Slider.h"
 
 #import "BlockExceptions.h"
 #import "TextField.h"
index dd8dc2c..db09bcb 100644 (file)
 #include "IntPoint.h"
 #include "Widget.h"
 #include "GraphicsContext.h"
-#include "WebCoreSlider.h"
+#include "Slider.h"
 #include "Cursor.h"
 #include "loader.h"
 #include "FrameView.h"
 #include "KURL.h"
-#include "WebCoreScrollBar.h"
+#include "ScrollBar.h"
 #include "JavaAppletWidget.h"
-#include "WebCoreScrollBar.h"
+#include "ScrollBar.h"
 #include "Path.h"
 #include "PlatformMouseEvent.h"
 #include "CookieJar.h"
index ba0d071..4bcb1fd 100644 (file)
@@ -29,7 +29,7 @@
 #include "EventNames.h"
 #include "HTMLNames.h"
 #include "HTMLInputElement.h"
-#include "WebCoreSlider.h"
+#include "Slider.h"
 
 using std::min;
 
index 2314247..ccfa3e0 100644 (file)
  *
  */
 
-#ifndef render_object_h
-#define render_object_h
+#ifndef RenderObject_h
+#define RenderObject_h
 
 #include "CachedObjectClient.h"
-#include "WebCoreScrollBar.h"
-#include "VisiblePosition.h"
 #include "RenderStyle.h"
+#include "ScrollBar.h"
+#include "VisiblePosition.h"
 
 class CSSStyle;
 class AffineTransform;
index 911dbb2..b848bfa 100644 (file)
@@ -38,8 +38,6 @@
 #include <kjs/protect.h>
 #include <wtf/Vector.h>
 
-using namespace KIO;
-
 namespace WebCore {
 
 using namespace EventNames;