From 5461f2587f09db45fac0a6f6e1b9c62f638aebc0 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 8 Jun 2011 10:42:33 +0100 Subject: Merge WebKit at r82507: Fix conflicts due to new StorageTracker - FileSystemAndroid.cpp, FileSystemPOSIX.cpp Use new common version of listDirectory(), which is identical to the existing Android version. - StorageNamespace.h, StorageNamespaceImpl.h Conflict due to Android's clearPage() - PageGroup.cpp Conflict due to Android's clearDomStorage() See http://trac.webkit.org/changeset/80892 Change-Id: Ifac131155f5019959de8761438cd0372547b0e6c --- Source/WebCore/storage/StorageNamespace.h | 10 +++------- Source/WebCore/storage/StorageNamespaceImpl.h | 11 ++++------- 2 files changed, 7 insertions(+), 14 deletions(-) (limited to 'Source/WebCore/storage') diff --git a/Source/WebCore/storage/StorageNamespace.h b/Source/WebCore/storage/StorageNamespace.h index f5604b0..0571f16 100644 --- a/Source/WebCore/storage/StorageNamespace.h +++ b/Source/WebCore/storage/StorageNamespace.h @@ -50,16 +50,12 @@ public: virtual PassRefPtr copy() = 0; virtual void close() = 0; virtual void unlock() = 0; -<<<<<<< HEAD - -#ifdef ANDROID - virtual void clear(Page*) = 0; -#endif -======= virtual void clearOriginForDeletion(SecurityOrigin*) = 0; virtual void clearAllOriginsForDeletion() = 0; virtual void sync() = 0; ->>>>>>> webkit.org at r82507 +#ifdef ANDROID + virtual void clear(Page*) = 0; +#endif }; } // namespace WebCore diff --git a/Source/WebCore/storage/StorageNamespaceImpl.h b/Source/WebCore/storage/StorageNamespaceImpl.h index 871f540..f13ff47 100644 --- a/Source/WebCore/storage/StorageNamespaceImpl.h +++ b/Source/WebCore/storage/StorageNamespaceImpl.h @@ -53,12 +53,6 @@ namespace WebCore { virtual void close(); virtual void unlock(); -<<<<<<< HEAD -#ifdef ANDROID - virtual void clear(Page*); -#endif - -======= // Not removing the origin's StorageArea from m_storageAreaMap because // we're just deleting the underlying db file. If an item is added immediately // after file deletion, we want the same StorageArea to eventually trigger @@ -67,7 +61,10 @@ namespace WebCore { virtual void clearAllOriginsForDeletion(); virtual void sync(); ->>>>>>> webkit.org at r82507 +#ifdef ANDROID + virtual void clear(Page*); +#endif + private: StorageNamespaceImpl(StorageType, const String& path, unsigned quota); -- cgit v1.1