1 files changed, 15 insertions, 10 deletions

diff --git a/WebCore/storage/IDBAny.h b/WebCore/storage/IDBAny.h
index a7859a1..950660a 100644
--- a/WebCore/storage/IDBAny.h
+++ b/WebCore/storage/IDBAny.h
@@ -34,10 +34,11 @@
 
 namespace WebCore {
 
-class IDBDatabaseRequest;
+class IDBCursor;
+class IDBDatabase;
 class IDBIndex;
 class IDBKey;
-class IDBObjectStoreRequest;
+class IDBObjectStore;
 class IDBFactory;
 class SerializedScriptValue;
 
@@ -56,30 +57,33 @@ public:
     enum Type {
         UndefinedType = 0,
         NullType,
-        IDBDatabaseRequestType,
+        IDBCursorType,
+        IDBDatabaseType,
         IDBFactoryType,
         IDBIndexType,
         IDBKeyType,
-        IDBObjectStoreRequestType,
+        IDBObjectStoreType,
         SerializedScriptValueType
     };
 
     Type type() const { return m_type; }
     // Use type() to figure out which one of these you're allowed to call.
-    PassRefPtr<IDBDatabaseRequest> idbDatabaseRequest();
+    PassRefPtr<IDBCursor> idbCursor();
+    PassRefPtr<IDBDatabase> idbDatabase();
     PassRefPtr<IDBFactory> idbFactory();
     PassRefPtr<IDBIndex> idbIndex();
     PassRefPtr<IDBKey> idbKey();
-    PassRefPtr<IDBObjectStoreRequest> idbObjectStoreRequest();
+    PassRefPtr<IDBObjectStore> idbObjectStore();
     PassRefPtr<SerializedScriptValue> serializedScriptValue();
 
     // Set can only be called once.
     void set(); // For "null".
-    void set(PassRefPtr<IDBDatabaseRequest>);
+    void set(PassRefPtr<IDBCursor>);
+    void set(PassRefPtr<IDBDatabase>);
     void set(PassRefPtr<IDBFactory>);
     void set(PassRefPtr<IDBIndex>);
     void set(PassRefPtr<IDBKey>);
-    void set(PassRefPtr<IDBObjectStoreRequest>);
+    void set(PassRefPtr<IDBObjectStore>);
     void set(PassRefPtr<SerializedScriptValue>);
 
 private:
@@ -88,11 +92,12 @@ private:
     Type m_type;
 
     // Only one of the following should ever be in use at any given time.
-    RefPtr<IDBDatabaseRequest> m_idbDatabaseRequest;
+    RefPtr<IDBCursor> m_idbCursor;
+    RefPtr<IDBDatabase> m_idbDatabase;
     RefPtr<IDBFactory> m_idbFactory;
     RefPtr<IDBIndex> m_idbIndex;
     RefPtr<IDBKey> m_idbKey;
-    RefPtr<IDBObjectStoreRequest> m_idbObjectStoreRequest;
+    RefPtr<IDBObjectStore> m_idbObjectStore;
     RefPtr<SerializedScriptValue> m_serializedScriptValue;
 };