Commit 3e865649 authored by darin's avatar darin

- 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.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@15258 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 77e51565
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
......
......@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
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;"
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;"
PreprocessorDefinitions="WIN32;KHTML_NO_XBL;KHTML_XSLT;XPATH_SUPPORT"
MinimalRebuild="true"
ExceptionHandling="0"
......@@ -108,7 +108,7 @@
/>
<Tool
Name="VCCLCompilerTool"
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;"
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;"
PreprocessorDefinitions="WIN32;KHTML_NO_XBL;KHTML_XSLT;XPATH_SUPPORT;NDEBUG"
ExceptionHandling="0"
RuntimeLibrary="2"
......@@ -159,51 +159,11 @@
>
</File>
<File
RelativePath="..\..\kwq\PopUpButton.h"
RelativePath="..\..\page\Settings.h"
>
</File>
<File
RelativePath="..\..\kwq\FileButton.h"
>
</File>
<File
RelativePath="..\..\kwq\Settings.h"
>
</File>
<File
RelativePath="..\..\kwq\SSLKeyGenerator.h"
>
</File>
<File
RelativePath="..\..\kwq\TextField.h"
>
</File>
<File
RelativePath="..\..\kwq\ListBox.h"
>
</File>
<File
RelativePath="..\..\kwq\LoaderFunctions.h"
>
</File>
<File
RelativePath="..\..\kwq\DeprecatedPtrQueue.h"
>
</File>
<File
RelativePath="..\..\kwq\WebCoreScrollBar.h"
>
</File>
<File
RelativePath="..\..\kwq\WebCoreSlider.h"
>
</File>
<File
RelativePath="..\..\kwq\TextBox.h"
>
</File>
<File
RelativePath="..\..\kwq\AffineTransform.h"
RelativePath="..\..\loader\LoaderFunctions.h"
>
</File>
</Filter>
......@@ -1142,6 +1102,10 @@
<Filter
Name="platform"
>
<File
RelativePath="..\..\platform\AffineTransform.h"
>
</File>
<File
RelativePath="..\..\platform\Arena.cpp"
>
......@@ -1222,6 +1186,10 @@
RelativePath="..\..\platform\DeprecatedPtrListImpl.h"
>
</File>
<File
RelativePath="..\..\platform\DeprecatedPtrQueue.h"
>
</File>
<File
RelativePath="..\..\platform\DeprecatedString.cpp"
>
......@@ -1250,6 +1218,10 @@
RelativePath="..\..\platform\DeprecatedValueListImpl.h"
>
</File>
<File
RelativePath="..\..\platform\FileButton.h"
>
</File>
<File
RelativePath="..\..\platform\FloatPoint.cpp"
>
......@@ -1398,6 +1370,10 @@
RelativePath="..\..\platform\Language.h"
>
</File>
<File
RelativePath="..\..\platform\ListBox.h"
>
</File>
<File
RelativePath="..\..\platform\LocalizedStrings.h"
>
......@@ -1442,6 +1418,10 @@
RelativePath="..\..\platform\PlugInInfoStore.h"
>
</File>
<File
RelativePath="..\..\platform\PopUpButton.h"
>
</File>
<File
RelativePath="..\..\platform\RegularExpression.cpp"
>
......@@ -1458,6 +1438,10 @@
RelativePath="..\..\platform\ScrollBarMode.h"
>
</File>
<File
RelativePath="..\..\platform\ScrollBar.h"
>
</File>
<File
RelativePath="..\..\platform\ScrollView.h"
>
......@@ -1478,6 +1462,14 @@
RelativePath="..\..\platform\SharedTimer.h"
>
</File>
<File
RelativePath="..\..\platform\Slider.h"
>
</File>
<File
RelativePath="..\..\platform\SSLKeyGenerator.h"
>
</File>
<File
RelativePath="..\..\platform\StaticConstructors.h"
>
......@@ -1510,6 +1502,10 @@
RelativePath="..\..\platform\TextBoundaries.h"
>
</File>
<File
RelativePath="..\..\platform\TextBox.h"
>
</File>
<File
RelativePath="..\..\platform\TextEncoding.cpp"
>
......@@ -1518,6 +1514,10 @@
RelativePath="..\..\platform\TextEncoding.h"
>
</File>
<File
RelativePath="..\..\platform\TextField.h"
>
</File>
<File
RelativePath="..\..\platform\TextStream.cpp"
>
......
This diff is collapsed.
......@@ -85,7 +85,6 @@
using namespace std;
using namespace KJS::Bindings;
using namespace KIO;
using KJS::JSLock;
using KJS::PausedTimeouts;
......
......@@ -28,7 +28,7 @@
#define Element_h
#include "Attr.h"
#include "WebCoreScrollBar.h"
#include "ScrollBar.h"
namespace WebCore {
......
......@@ -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));
......
......@@ -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.
......
......@@ -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;
......
/*
* 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
......@@ -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;
......
......@@ -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();
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
/*
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);