diff options
author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/storage/StorageNamespaceImpl.h | |
parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/storage/StorageNamespaceImpl.h')
-rw-r--r-- | Source/WebCore/storage/StorageNamespaceImpl.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Source/WebCore/storage/StorageNamespaceImpl.h b/Source/WebCore/storage/StorageNamespaceImpl.h index c2361fa..871f540 100644 --- a/Source/WebCore/storage/StorageNamespaceImpl.h +++ b/Source/WebCore/storage/StorageNamespaceImpl.h @@ -53,10 +53,21 @@ 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 + // a sync and for StorageAreaSync to recreate the backing db file. + virtual void clearOriginForDeletion(SecurityOrigin*); + virtual void clearAllOriginsForDeletion(); + virtual void sync(); + +>>>>>>> webkit.org at r82507 private: StorageNamespaceImpl(StorageType, const String& path, unsigned quota); |