[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
eric at webkit.org
eric at webkit.org
Wed Dec 22 15:32:58 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit e06abe1c7b0de7b4e2661ecae40ec2b1e21314e6
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 8 05:30:16 2010 +0000
2010-11-07 Eric Seidel <eric at webkit.org>
Reviewed by Adam Barth.
Move the rest of the cache-related files into loader/cache
https://bugs.webkit.org/show_bug.cgi?id=49156
* GNUmakefile.am:
* WebCore.gypi:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* loader/CachePolicy.h: Removed.
* loader/CachedCSSStyleSheet.cpp: Removed.
* loader/CachedCSSStyleSheet.h: Removed.
* loader/CachedFont.cpp: Removed.
* loader/CachedFont.h: Removed.
* loader/CachedImage.cpp: Removed.
* loader/CachedImage.h: Removed.
* loader/CachedResource.cpp: Removed.
* loader/CachedResource.h: Removed.
* loader/CachedResourceClient.h: Removed.
* loader/CachedResourceClientWalker.cpp: Removed.
* loader/CachedResourceClientWalker.h: Removed.
* loader/CachedResourceHandle.cpp: Removed.
* loader/CachedResourceHandle.h: Removed.
* loader/CachedResourceLoader.cpp: Removed.
* loader/CachedResourceLoader.h: Removed.
* loader/CachedScript.cpp: Removed.
* loader/CachedScript.h: Removed.
* loader/CachedXSLStyleSheet.cpp: Removed.
* loader/CachedXSLStyleSheet.h: Removed.
* loader/cache/CachePolicy.h: Copied from WebCore/loader/CachePolicy.h.
* loader/cache/CachedCSSStyleSheet.cpp: Copied from WebCore/loader/CachedCSSStyleSheet.cpp.
* loader/cache/CachedCSSStyleSheet.h: Copied from WebCore/loader/CachedCSSStyleSheet.h.
* loader/cache/CachedFont.cpp: Copied from WebCore/loader/CachedFont.cpp.
* loader/cache/CachedFont.h: Copied from WebCore/loader/CachedFont.h.
* loader/cache/CachedImage.cpp: Copied from WebCore/loader/CachedImage.cpp.
* loader/cache/CachedImage.h: Copied from WebCore/loader/CachedImage.h.
* loader/cache/CachedResource.cpp: Copied from WebCore/loader/CachedResource.cpp.
* loader/cache/CachedResource.h: Copied from WebCore/loader/CachedResource.h.
* loader/cache/CachedResourceClient.h: Copied from WebCore/loader/CachedResourceClient.h.
* loader/cache/CachedResourceClientWalker.cpp: Copied from WebCore/loader/CachedResourceClientWalker.cpp.
* loader/cache/CachedResourceClientWalker.h: Copied from WebCore/loader/CachedResourceClientWalker.h.
* loader/cache/CachedResourceHandle.cpp: Copied from WebCore/loader/CachedResourceHandle.cpp.
* loader/cache/CachedResourceHandle.h: Copied from WebCore/loader/CachedResourceHandle.h.
* loader/cache/CachedResourceLoader.cpp: Copied from WebCore/loader/CachedResourceLoader.cpp.
* loader/cache/CachedResourceLoader.h: Copied from WebCore/loader/CachedResourceLoader.h.
* loader/cache/CachedScript.cpp: Copied from WebCore/loader/CachedScript.cpp.
* loader/cache/CachedScript.h: Copied from WebCore/loader/CachedScript.h.
* loader/cache/CachedXSLStyleSheet.cpp: Copied from WebCore/loader/CachedXSLStyleSheet.cpp.
* loader/cache/CachedXSLStyleSheet.h: Copied from WebCore/loader/CachedXSLStyleSheet.h.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71496 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index 712fdf0..12f36d7 100644
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -343,16 +343,16 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
html/parser/TextDocumentParser.cpp \
html/parser/TextViewSourceParser.cpp \
\
- loader/CachedCSSStyleSheet.cpp \
- loader/CachedFont.cpp \
- loader/CachedImage.cpp \
- loader/CachedResource.cpp \
- loader/CachedResourceClientWalker.cpp \
- loader/CachedResourceHandle.cpp \
- loader/CachedScript.cpp \
+ loader/cache/CachedCSSStyleSheet.cpp \
+ loader/cache/CachedFont.cpp \
+ loader/cache/CachedImage.cpp \
+ loader/cache/CachedResource.cpp \
+ loader/cache/CachedResourceClientWalker.cpp \
+ loader/cache/CachedResourceHandle.cpp \
+ loader/cache/CachedScript.cpp \
loader/CrossOriginAccessControl.cpp \
loader/CrossOriginPreflightResultCache.cpp \
- loader/CachedResourceLoader.cpp \
+ loader/cache/CachedResourceLoader.cpp \
loader/DocumentLoader.cpp \
loader/DocumentThreadableLoader.cpp \
loader/DocumentWriter.cpp \
diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index 211ccc3..4ac40f2 100644
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -1139,17 +1139,17 @@ SET(WebCore_SOURCES
inspector/ScriptBreakpoint.cpp
inspector/TimelineRecordFactory.cpp
- loader/CachedCSSStyleSheet.cpp
- loader/CachedFont.cpp
- loader/CachedImage.cpp
- loader/CachedResource.cpp
- loader/CachedResourceClientWalker.cpp
- loader/CachedResourceHandle.cpp
- loader/CachedScript.cpp
- loader/CachedXSLStyleSheet.cpp
+ loader/cache/CachedCSSStyleSheet.cpp
+ loader/cache/CachedFont.cpp
+ loader/cache/CachedImage.cpp
+ loader/cache/CachedResource.cpp
+ loader/cache/CachedResourceClientWalker.cpp
+ loader/cache/CachedResourceHandle.cpp
+ loader/cache/CachedScript.cpp
+ loader/cache/CachedXSLStyleSheet.cpp
loader/CrossOriginAccessControl.cpp
loader/CrossOriginPreflightResultCache.cpp
- loader/CachedResourceLoader.cpp
+ loader/cache/CachedResourceLoader.cpp
loader/DocumentLoader.cpp
loader/DocumentThreadableLoader.cpp
loader/DocumentWriter.cpp
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ba0bc01..6d28a93 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,55 @@
+2010-11-07 Eric Seidel <eric at webkit.org>
+
+ Reviewed by Adam Barth.
+
+ Move the rest of the cache-related files into loader/cache
+ https://bugs.webkit.org/show_bug.cgi?id=49156
+
+ * GNUmakefile.am:
+ * WebCore.gypi:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * loader/CachePolicy.h: Removed.
+ * loader/CachedCSSStyleSheet.cpp: Removed.
+ * loader/CachedCSSStyleSheet.h: Removed.
+ * loader/CachedFont.cpp: Removed.
+ * loader/CachedFont.h: Removed.
+ * loader/CachedImage.cpp: Removed.
+ * loader/CachedImage.h: Removed.
+ * loader/CachedResource.cpp: Removed.
+ * loader/CachedResource.h: Removed.
+ * loader/CachedResourceClient.h: Removed.
+ * loader/CachedResourceClientWalker.cpp: Removed.
+ * loader/CachedResourceClientWalker.h: Removed.
+ * loader/CachedResourceHandle.cpp: Removed.
+ * loader/CachedResourceHandle.h: Removed.
+ * loader/CachedResourceLoader.cpp: Removed.
+ * loader/CachedResourceLoader.h: Removed.
+ * loader/CachedScript.cpp: Removed.
+ * loader/CachedScript.h: Removed.
+ * loader/CachedXSLStyleSheet.cpp: Removed.
+ * loader/CachedXSLStyleSheet.h: Removed.
+ * loader/cache/CachePolicy.h: Copied from WebCore/loader/CachePolicy.h.
+ * loader/cache/CachedCSSStyleSheet.cpp: Copied from WebCore/loader/CachedCSSStyleSheet.cpp.
+ * loader/cache/CachedCSSStyleSheet.h: Copied from WebCore/loader/CachedCSSStyleSheet.h.
+ * loader/cache/CachedFont.cpp: Copied from WebCore/loader/CachedFont.cpp.
+ * loader/cache/CachedFont.h: Copied from WebCore/loader/CachedFont.h.
+ * loader/cache/CachedImage.cpp: Copied from WebCore/loader/CachedImage.cpp.
+ * loader/cache/CachedImage.h: Copied from WebCore/loader/CachedImage.h.
+ * loader/cache/CachedResource.cpp: Copied from WebCore/loader/CachedResource.cpp.
+ * loader/cache/CachedResource.h: Copied from WebCore/loader/CachedResource.h.
+ * loader/cache/CachedResourceClient.h: Copied from WebCore/loader/CachedResourceClient.h.
+ * loader/cache/CachedResourceClientWalker.cpp: Copied from WebCore/loader/CachedResourceClientWalker.cpp.
+ * loader/cache/CachedResourceClientWalker.h: Copied from WebCore/loader/CachedResourceClientWalker.h.
+ * loader/cache/CachedResourceHandle.cpp: Copied from WebCore/loader/CachedResourceHandle.cpp.
+ * loader/cache/CachedResourceHandle.h: Copied from WebCore/loader/CachedResourceHandle.h.
+ * loader/cache/CachedResourceLoader.cpp: Copied from WebCore/loader/CachedResourceLoader.cpp.
+ * loader/cache/CachedResourceLoader.h: Copied from WebCore/loader/CachedResourceLoader.h.
+ * loader/cache/CachedScript.cpp: Copied from WebCore/loader/CachedScript.cpp.
+ * loader/cache/CachedScript.h: Copied from WebCore/loader/CachedScript.h.
+ * loader/cache/CachedXSLStyleSheet.cpp: Copied from WebCore/loader/CachedXSLStyleSheet.cpp.
+ * loader/cache/CachedXSLStyleSheet.h: Copied from WebCore/loader/CachedXSLStyleSheet.h.
+
2010-11-07 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 5441d0e..bb3d3d6 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -1907,28 +1907,28 @@ webcore_sources += \
WebCore/loader/archive/ArchiveResource.cpp \
WebCore/loader/archive/ArchiveResource.h \
WebCore/loader/cache/Cache.cpp \
- WebCore/loader/CachedCSSStyleSheet.cpp \
- WebCore/loader/CachedCSSStyleSheet.h \
- WebCore/loader/CachedFont.cpp \
- WebCore/loader/CachedFont.h \
- WebCore/loader/CachedImage.cpp \
- WebCore/loader/CachedImage.h \
+ WebCore/loader/cache/CachedCSSStyleSheet.cpp \
+ WebCore/loader/cache/CachedCSSStyleSheet.h \
+ WebCore/loader/cache/CachedFont.cpp \
+ WebCore/loader/cache/CachedFont.h \
+ WebCore/loader/cache/CachedImage.cpp \
+ WebCore/loader/cache/CachedImage.h \
+ WebCore/loader/cache/CachedResourceClient.h \
+ WebCore/loader/cache/CachedResourceClientWalker.cpp \
+ WebCore/loader/cache/CachedResourceClientWalker.h \
+ WebCore/loader/cache/CachedResource.cpp \
+ WebCore/loader/cache/CachedResource.h \
+ WebCore/loader/cache/CachedResourceHandle.cpp \
+ WebCore/loader/cache/CachedResourceHandle.h \
+ WebCore/loader/cache/CachedResourceLoader.cpp \
+ WebCore/loader/cache/CachedResourceLoader.h \
+ WebCore/loader/cache/CachedScript.cpp \
+ WebCore/loader/cache/CachedScript.h \
+ WebCore/loader/cache/CachedXSLStyleSheet.cpp \
+ WebCore/loader/cache/CachedXSLStyleSheet.h \
+ WebCore/loader/cache/Cache.h \
+ WebCore/loader/cache/CachePolicy.h \
WebCore/loader/CachedMetadata.h \
- WebCore/loader/CachedResourceClient.h \
- WebCore/loader/CachedResourceClientWalker.cpp \
- WebCore/loader/CachedResourceClientWalker.h \
- WebCore/loader/CachedResource.cpp \
- WebCore/loader/CachedResource.h \
- WebCore/loader/CachedResourceHandle.cpp \
- WebCore/loader/CachedResourceHandle.h \
- WebCore/loader/CachedResourceLoader.cpp \
- WebCore/loader/CachedResourceLoader.h \
- WebCore/loader/CachedScript.cpp \
- WebCore/loader/CachedScript.h \
- WebCore/loader/CachedXSLStyleSheet.cpp \
- WebCore/loader/CachedXSLStyleSheet.h \
- WebCore/loader/Cache.h \
- WebCore/loader/CachePolicy.h \
WebCore/loader/CrossOriginAccessControl.cpp \
WebCore/loader/CrossOriginAccessControl.h \
WebCore/loader/CrossOriginPreflightResultCache.cpp \
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 0ef8e78..7c96378 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -2013,6 +2013,26 @@
'loader/archive/ArchiveResourceCollection.h',
'loader/cache/Cache.cpp',
'loader/cache/Cache.h',
+ 'loader/cache/CachedCSSStyleSheet.cpp',
+ 'loader/cache/CachedCSSStyleSheet.h',
+ 'loader/cache/CachedFont.cpp',
+ 'loader/cache/CachedFont.h',
+ 'loader/cache/CachedImage.cpp',
+ 'loader/cache/CachedImage.h',
+ 'loader/cache/CachedResource.cpp',
+ 'loader/cache/CachedResource.h',
+ 'loader/cache/CachedResourceClient.h',
+ 'loader/cache/CachedResourceClientWalker.cpp',
+ 'loader/cache/CachedResourceClientWalker.h',
+ 'loader/cache/CachedResourceHandle.cpp',
+ 'loader/cache/CachedResourceHandle.h',
+ 'loader/cache/CachedResourceLoader.cpp',
+ 'loader/cache/CachedResourceLoader.h',
+ 'loader/cache/CachedScript.cpp',
+ 'loader/cache/CachedScript.h',
+ 'loader/cache/CachedXSLStyleSheet.cpp',
+ 'loader/cache/CachedXSLStyleSheet.h',
+ 'loader/cache/CachePolicy.h',
'loader/icon/IconDatabase.cpp',
'loader/icon/IconDatabase.h',
'loader/icon/IconDatabaseClient.h',
@@ -2030,30 +2050,10 @@
'loader/win/DocumentLoaderWin.cpp',
'loader/win/FrameLoaderWin.cpp',
'loader/CachedMetadata.h',
- 'loader/CachePolicy.h',
- 'loader/CachedCSSStyleSheet.cpp',
- 'loader/CachedCSSStyleSheet.h',
- 'loader/CachedFont.cpp',
- 'loader/CachedFont.h',
- 'loader/CachedImage.cpp',
- 'loader/CachedImage.h',
- 'loader/CachedResource.cpp',
- 'loader/CachedResource.h',
- 'loader/CachedResourceClient.h',
- 'loader/CachedResourceClientWalker.cpp',
- 'loader/CachedResourceClientWalker.h',
- 'loader/CachedResourceHandle.cpp',
- 'loader/CachedResourceHandle.h',
- 'loader/CachedScript.cpp',
- 'loader/CachedScript.h',
- 'loader/CachedXSLStyleSheet.cpp',
- 'loader/CachedXSLStyleSheet.h',
'loader/CrossOriginAccessControl.cpp',
'loader/CrossOriginAccessControl.h',
'loader/CrossOriginPreflightResultCache.cpp',
'loader/CrossOriginPreflightResultCache.h',
- 'loader/CachedResourceLoader.cpp',
- 'loader/CachedResourceLoader.h',
'loader/DocumentLoadTiming.h',
'loader/DocumentLoader.cpp',
'loader/DocumentLoader.h',
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 5c0365f..c1dbd19 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -1033,17 +1033,17 @@ SOURCES += \
loader/archive/ArchiveResource.cpp \
loader/archive/ArchiveResourceCollection.cpp \
loader/cache/Cache.cpp \
- loader/CachedCSSStyleSheet.cpp \
- loader/CachedFont.cpp \
- loader/CachedImage.cpp \
- loader/CachedResourceClientWalker.cpp \
- loader/CachedResourceHandle.cpp \
- loader/CachedResource.cpp \
- loader/CachedScript.cpp \
- loader/CachedXSLStyleSheet.cpp \
+ loader/cache/CachedCSSStyleSheet.cpp \
+ loader/cache/CachedFont.cpp \
+ loader/cache/CachedImage.cpp \
+ loader/cache/CachedResourceClientWalker.cpp \
+ loader/cache/CachedResourceHandle.cpp \
+ loader/cache/CachedResource.cpp \
+ loader/cache/CachedScript.cpp \
+ loader/cache/CachedXSLStyleSheet.cpp \
loader/CrossOriginAccessControl.cpp \
loader/CrossOriginPreflightResultCache.cpp \
- loader/CachedResourceLoader.cpp \
+ loader/cache/CachedResourceLoader.cpp \
loader/DocumentLoader.cpp \
loader/DocumentThreadableLoader.cpp \
loader/DocumentWriter.cpp \
@@ -1923,18 +1923,18 @@ HEADERS += \
loader/archive/ArchiveFactory.h \
loader/archive/ArchiveResourceCollection.h \
loader/archive/ArchiveResource.h \
- loader/CachedCSSStyleSheet.h \
- loader/CachedFont.h \
- loader/CachedImage.h \
- loader/CachedResourceClientWalker.h \
- loader/CachedResource.h \
- loader/CachedResourceHandle.h \
- loader/CachedScript.h \
- loader/CachedXSLStyleSheet.h \
+ loader/cache/CachedCSSStyleSheet.h \
+ loader/cache/CachedFont.h \
+ loader/cache/CachedImage.h \
+ loader/cache/CachedResourceClientWalker.h \
+ loader/cache/CachedResource.h \
+ loader/cache/CachedResourceHandle.h \
+ loader/cache/CachedScript.h \
+ loader/cache/CachedXSLStyleSheet.h \
loader/cache/Cache.h \
loader/CrossOriginAccessControl.h \
loader/CrossOriginPreflightResultCache.h \
- loader/CachedResourceLoader.h \
+ loader/cache/CachedResourceLoader.h \
loader/DocumentLoader.h \
loader/DocumentThreadableLoader.h \
loader/FormState.h \
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index ef26c42..e15729f 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -23708,86 +23708,6 @@
Name="loader"
>
<File
- RelativePath="..\loader\CachedCSSStyleSheet.cpp"
- >
- </File>
- <File
- RelativePath="..\loader\CachedCSSStyleSheet.h"
- >
- </File>
- <File
- RelativePath="..\loader\CachedFont.cpp"
- >
- </File>
- <File
- RelativePath="..\loader\CachedFont.h"
- >
- </File>
- <File
- RelativePath="..\loader\CachedImage.cpp"
- >
- </File>
- <File
- RelativePath="..\loader\CachedImage.h"
- >
- </File>
- <File
- RelativePath="..\loader\CachedResource.cpp"
- >
- </File>
- <File
- RelativePath="..\loader\CachedResource.h"
- >
- </File>
- <File
- RelativePath="..\loader\CachedResourceClient.h"
- >
- </File>
- <File
- RelativePath="..\loader\CachedResourceClientWalker.cpp"
- >
- </File>
- <File
- RelativePath="..\loader\CachedResourceClientWalker.h"
- >
- </File>
- <File
- RelativePath="..\loader\CachedResourceHandle.cpp"
- >
- </File>
- <File
- RelativePath="..\loader\CachedResourceHandle.h"
- >
- </File>
- <File
- RelativePath="..\loader\CachedResourceLoader.cpp"
- >
- </File>
- <File
- RelativePath="..\loader\CachedResourceLoader.h"
- >
- </File>
- <File
- RelativePath="..\loader\CachedScript.cpp"
- >
- </File>
- <File
- RelativePath="..\loader\CachedScript.h"
- >
- </File>
- <File
- RelativePath="..\loader\CachedXSLStyleSheet.cpp"
- >
- </File>
- <File
- RelativePath="..\loader\CachedXSLStyleSheet.h"
- >
- </File>
- <File
- RelativePath="..\loader\CachePolicy.h"
- >
- </File>
- <File
RelativePath="..\loader\CrossOriginAccessControl.cpp"
>
</File>
@@ -24250,6 +24170,86 @@
RelativePath="..\loader\cache\Cache.h"
>
</File>
+ <File
+ RelativePath="..\loader\cache\CachedCSSStyleSheet.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedCSSStyleSheet.h"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedFont.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedFont.h"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedImage.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedImage.h"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedResource.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedResource.h"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedResourceClient.h"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedResourceClientWalker.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedResourceClientWalker.h"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedResourceHandle.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedResourceHandle.h"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedResourceLoader.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedResourceLoader.h"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedScript.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedScript.h"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedXSLStyleSheet.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachedXSLStyleSheet.h"
+ >
+ </File>
+ <File
+ RelativePath="..\loader\cache\CachePolicy.h"
+ >
+ </File>
</Filter>
</Filter>
<Filter
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index ef4113f..32fbd12 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -11531,7 +11531,6 @@
E44614120CD6826900FADA75 /* JSTimeRanges.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTimeRanges.cpp; sourceTree = "<group>"; };
E44614130CD6826900FADA75 /* JSTimeRanges.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSTimeRanges.h; sourceTree = "<group>"; };
E462A4A0113E71BE004A4220 /* IntPointHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IntPointHash.h; sourceTree = "<group>"; };
- E472053A0E5A053A0006BB4D /* CachedResourceHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedResourceHandle.h; sourceTree = "<group>"; };
E4778B7D115A581A00B5D372 /* JSCustomEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCustomEvent.cpp; sourceTree = "<group>"; };
E4778B7E115A581A00B5D372 /* JSCustomEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCustomEvent.h; sourceTree = "<group>"; };
E47B4BE60E71241600038854 /* CachedResourceHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedResourceHandle.h; sourceTree = "<group>"; };
@@ -16024,6 +16023,26 @@
A8D2B2521287A56000AF4DDA /* cache */ = {
isa = PBXGroup;
children = (
+ BCB16C000979C3BD00467741 /* CachedCSSStyleSheet.cpp */,
+ BCB16C010979C3BD00467741 /* CachedCSSStyleSheet.h */,
+ BC64B4C90CB4295D005F2B62 /* CachedFont.cpp */,
+ BC64B4CA0CB4295D005F2B62 /* CachedFont.h */,
+ BCB16C020979C3BD00467741 /* CachedImage.cpp */,
+ BCB16C030979C3BD00467741 /* CachedImage.h */,
+ BCB16C060979C3BD00467741 /* CachedResource.cpp */,
+ BCB16C070979C3BD00467741 /* CachedResource.h */,
+ BCFB2E5D0979E46400BA703D /* CachedResourceClient.h */,
+ BCB16C080979C3BD00467741 /* CachedResourceClientWalker.cpp */,
+ BCB16C090979C3BD00467741 /* CachedResourceClientWalker.h */,
+ E47B4BE70E71241600038854 /* CachedResourceHandle.cpp */,
+ E47B4BE60E71241600038854 /* CachedResourceHandle.h */,
+ BCB16C100979C3BD00467741 /* CachedResourceLoader.cpp */,
+ BCB16C110979C3BD00467741 /* CachedResourceLoader.h */,
+ BCB16C0A0979C3BD00467741 /* CachedScript.cpp */,
+ BCB16C0B0979C3BD00467741 /* CachedScript.h */,
+ BCB16C0E0979C3BD00467741 /* CachedXSLStyleSheet.cpp */,
+ BCB16C0F0979C3BD00467741 /* CachedXSLStyleSheet.h */,
+ F587864902DE3A9A01EA4122 /* CachePolicy.h */,
BCB16BFE0979C3BD00467741 /* Cache.cpp */,
BCB16BFF0979C3BD00467741 /* Cache.h */,
);
@@ -17258,27 +17277,6 @@
512DD8E80D91E691000F89EE /* archive */,
5126E6B60A2E3AEF005C29FA /* icon */,
93A1EAA20A5634D8006960A0 /* mac */,
- BCB16C000979C3BD00467741 /* CachedCSSStyleSheet.cpp */,
- BCB16C010979C3BD00467741 /* CachedCSSStyleSheet.h */,
- BC64B4C90CB4295D005F2B62 /* CachedFont.cpp */,
- BC64B4CA0CB4295D005F2B62 /* CachedFont.h */,
- BCB16C020979C3BD00467741 /* CachedImage.cpp */,
- BCB16C030979C3BD00467741 /* CachedImage.h */,
- BCB16C060979C3BD00467741 /* CachedResource.cpp */,
- BCB16C070979C3BD00467741 /* CachedResource.h */,
- BCFB2E5D0979E46400BA703D /* CachedResourceClient.h */,
- BCB16C080979C3BD00467741 /* CachedResourceClientWalker.cpp */,
- BCB16C090979C3BD00467741 /* CachedResourceClientWalker.h */,
- E47B4BE70E71241600038854 /* CachedResourceHandle.cpp */,
- E47B4BE60E71241600038854 /* CachedResourceHandle.h */,
- E472053A0E5A053A0006BB4D /* CachedResourceHandle.h */,
- BCB16C100979C3BD00467741 /* CachedResourceLoader.cpp */,
- BCB16C110979C3BD00467741 /* CachedResourceLoader.h */,
- BCB16C0A0979C3BD00467741 /* CachedScript.cpp */,
- BCB16C0B0979C3BD00467741 /* CachedScript.h */,
- BCB16C0E0979C3BD00467741 /* CachedXSLStyleSheet.cpp */,
- BCB16C0F0979C3BD00467741 /* CachedXSLStyleSheet.h */,
- F587864902DE3A9A01EA4122 /* CachePolicy.h */,
E1C416160F6563180092D2FB /* CrossOriginAccessControl.cpp */,
E1C416110F6562FD0092D2FB /* CrossOriginAccessControl.h */,
E1C415DD0F655D7C0092D2FB /* CrossOriginPreflightResultCache.cpp */,
diff --git a/WebCore/loader/CachePolicy.h b/WebCore/loader/cache/CachePolicy.h
similarity index 100%
rename from WebCore/loader/CachePolicy.h
rename to WebCore/loader/cache/CachePolicy.h
diff --git a/WebCore/loader/CachedCSSStyleSheet.cpp b/WebCore/loader/cache/CachedCSSStyleSheet.cpp
similarity index 100%
rename from WebCore/loader/CachedCSSStyleSheet.cpp
rename to WebCore/loader/cache/CachedCSSStyleSheet.cpp
diff --git a/WebCore/loader/CachedCSSStyleSheet.h b/WebCore/loader/cache/CachedCSSStyleSheet.h
similarity index 100%
rename from WebCore/loader/CachedCSSStyleSheet.h
rename to WebCore/loader/cache/CachedCSSStyleSheet.h
diff --git a/WebCore/loader/CachedFont.cpp b/WebCore/loader/cache/CachedFont.cpp
similarity index 100%
rename from WebCore/loader/CachedFont.cpp
rename to WebCore/loader/cache/CachedFont.cpp
diff --git a/WebCore/loader/CachedFont.h b/WebCore/loader/cache/CachedFont.h
similarity index 100%
rename from WebCore/loader/CachedFont.h
rename to WebCore/loader/cache/CachedFont.h
diff --git a/WebCore/loader/CachedImage.cpp b/WebCore/loader/cache/CachedImage.cpp
similarity index 100%
rename from WebCore/loader/CachedImage.cpp
rename to WebCore/loader/cache/CachedImage.cpp
diff --git a/WebCore/loader/CachedImage.h b/WebCore/loader/cache/CachedImage.h
similarity index 100%
rename from WebCore/loader/CachedImage.h
rename to WebCore/loader/cache/CachedImage.h
diff --git a/WebCore/loader/CachedResource.cpp b/WebCore/loader/cache/CachedResource.cpp
similarity index 100%
rename from WebCore/loader/CachedResource.cpp
rename to WebCore/loader/cache/CachedResource.cpp
diff --git a/WebCore/loader/CachedResource.h b/WebCore/loader/cache/CachedResource.h
similarity index 100%
rename from WebCore/loader/CachedResource.h
rename to WebCore/loader/cache/CachedResource.h
diff --git a/WebCore/loader/CachedResourceClient.h b/WebCore/loader/cache/CachedResourceClient.h
similarity index 100%
rename from WebCore/loader/CachedResourceClient.h
rename to WebCore/loader/cache/CachedResourceClient.h
diff --git a/WebCore/loader/CachedResourceClientWalker.cpp b/WebCore/loader/cache/CachedResourceClientWalker.cpp
similarity index 100%
rename from WebCore/loader/CachedResourceClientWalker.cpp
rename to WebCore/loader/cache/CachedResourceClientWalker.cpp
diff --git a/WebCore/loader/CachedResourceClientWalker.h b/WebCore/loader/cache/CachedResourceClientWalker.h
similarity index 100%
rename from WebCore/loader/CachedResourceClientWalker.h
rename to WebCore/loader/cache/CachedResourceClientWalker.h
diff --git a/WebCore/loader/CachedResourceHandle.cpp b/WebCore/loader/cache/CachedResourceHandle.cpp
similarity index 100%
rename from WebCore/loader/CachedResourceHandle.cpp
rename to WebCore/loader/cache/CachedResourceHandle.cpp
diff --git a/WebCore/loader/CachedResourceHandle.h b/WebCore/loader/cache/CachedResourceHandle.h
similarity index 100%
rename from WebCore/loader/CachedResourceHandle.h
rename to WebCore/loader/cache/CachedResourceHandle.h
diff --git a/WebCore/loader/CachedResourceLoader.cpp b/WebCore/loader/cache/CachedResourceLoader.cpp
similarity index 100%
rename from WebCore/loader/CachedResourceLoader.cpp
rename to WebCore/loader/cache/CachedResourceLoader.cpp
diff --git a/WebCore/loader/CachedResourceLoader.h b/WebCore/loader/cache/CachedResourceLoader.h
similarity index 100%
rename from WebCore/loader/CachedResourceLoader.h
rename to WebCore/loader/cache/CachedResourceLoader.h
diff --git a/WebCore/loader/CachedScript.cpp b/WebCore/loader/cache/CachedScript.cpp
similarity index 100%
rename from WebCore/loader/CachedScript.cpp
rename to WebCore/loader/cache/CachedScript.cpp
diff --git a/WebCore/loader/CachedScript.h b/WebCore/loader/cache/CachedScript.h
similarity index 100%
rename from WebCore/loader/CachedScript.h
rename to WebCore/loader/cache/CachedScript.h
diff --git a/WebCore/loader/CachedXSLStyleSheet.cpp b/WebCore/loader/cache/CachedXSLStyleSheet.cpp
similarity index 100%
rename from WebCore/loader/CachedXSLStyleSheet.cpp
rename to WebCore/loader/cache/CachedXSLStyleSheet.cpp
diff --git a/WebCore/loader/CachedXSLStyleSheet.h b/WebCore/loader/cache/CachedXSLStyleSheet.h
similarity index 100%
rename from WebCore/loader/CachedXSLStyleSheet.h
rename to WebCore/loader/cache/CachedXSLStyleSheet.h
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index a283ca1..ed43b4d 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -64,6 +64,7 @@ INCLUDEPATH = \
$$PWD/../WebCore/loader \
$$PWD/../WebCore/loader/appcache \
$$PWD/../WebCore/loader/archive \
+ $$PWD/../WebCore/loader/cache \
$$PWD/../WebCore/loader/icon \
$$PWD/../WebCore/mathml \
$$PWD/../WebCore/notifications \
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list