From 545e470e52f0ac6a3a072bf559c796b42c6066b6 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Tue, 15 Jun 2010 19:36:43 +0100
Subject: Merge webkit.org at r61121: Initial merge by git.

Change-Id: Icd6db395c62285be384d137164d95d7466c98760
---
 WebCore/storage/IDBDatabase.h | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'WebCore/storage/IDBDatabase.h')

diff --git a/WebCore/storage/IDBDatabase.h b/WebCore/storage/IDBDatabase.h
index 5bfb3c7..0055ad1 100644
--- a/WebCore/storage/IDBDatabase.h
+++ b/WebCore/storage/IDBDatabase.h
@@ -35,6 +35,9 @@
 namespace WebCore {
 
 class DOMStringList;
+class Frame;
+class IDBCallbacks;
+class IDBObjectStore;
 
 // This class is shared by IDBDatabaseRequest (async) and IDBDatabaseSync (sync).
 // This is implemented by IDBDatabaseImpl and optionally others (in order to proxy
@@ -44,10 +47,16 @@ class IDBDatabase : public ThreadSafeShared<IDBDatabase> {
 public:
     virtual ~IDBDatabase() { }
 
-    virtual String name() = 0;
-    virtual String description() = 0;
-    virtual String version() = 0;
-    virtual PassRefPtr<DOMStringList> objectStores() = 0;
+    virtual String name() const = 0;
+    virtual String description() const = 0;
+    virtual String version() const = 0;
+    virtual PassRefPtr<DOMStringList> objectStores() const = 0;
+
+    // FIXME: Add transaction and setVersion.
+
+    virtual void createObjectStore(const String& name, const String& keyPath, bool autoIncrement, PassRefPtr<IDBCallbacks>) = 0;
+    virtual PassRefPtr<IDBObjectStore> objectStore(const String& name, unsigned short mode) = 0;
+    virtual void removeObjectStore(const String& name, PassRefPtr<IDBCallbacks>) = 0;
 };
 
 } // namespace WebCore
-- 
cgit v1.1