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);