diff options
| author | Steve Block <steveblock@google.com> | 2011-06-08 10:42:33 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:52:19 +0100 |
| commit | 5461f2587f09db45fac0a6f6e1b9c62f638aebc0 (patch) | |
| tree | af1db1ccafffc50b49e7edbf1a85845e4ea2a8d3 /Source/WebCore/storage/StorageNamespace.h | |
| parent | 74ee772b3c1ea8b557e5a596e9cbc655d1c0e161 (diff) | |
| download | external_webkit-5461f2587f09db45fac0a6f6e1b9c62f638aebc0.zip external_webkit-5461f2587f09db45fac0a6f6e1b9c62f638aebc0.tar.gz external_webkit-5461f2587f09db45fac0a6f6e1b9c62f638aebc0.tar.bz2 | |
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
Diffstat (limited to 'Source/WebCore/storage/StorageNamespace.h')
| -rw-r--r-- | Source/WebCore/storage/StorageNamespace.h | 10 |
1 files changed, 3 insertions, 7 deletions
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<StorageNamespace> 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 |