Merge WebKit at r63173 : Initial merge by git.

Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44

1 files changed, 5 insertions, 0 deletions

diff --git a/WebCore/storage/IDBAny.h b/WebCore/storage/IDBAny.h
index a734d13..ff2d6b9 100644
--- a/WebCore/storage/IDBAny.h
+++ b/WebCore/storage/IDBAny.h
@@ -36,6 +36,7 @@ namespace WebCore {
 
 class IDBDatabaseRequest;
 class IDBIndexRequest;
+class IDBKey;
 class IDBObjectStoreRequest;
 class IndexedDatabaseRequest;
 class SerializedScriptValue;
@@ -50,6 +51,7 @@ public:
         NullType,
         IDBDatabaseRequestType,
         IDBIndexRequestType,
+        IDBKeyType,
         IDBObjectStoreRequestType,
         IndexedDatabaseRequestType,
         SerializedScriptValueType
@@ -59,6 +61,7 @@ public:
     // Use type() to figure out which one of these you're allowed to call.
     PassRefPtr<IDBDatabaseRequest> idbDatabaseRequest();
     PassRefPtr<IDBIndexRequest> idbIndexRequest();
+    PassRefPtr<IDBKey> idbKey();
     PassRefPtr<IDBObjectStoreRequest> idbObjectStoreRequest();
     PassRefPtr<IndexedDatabaseRequest> indexedDatabaseRequest();
     PassRefPtr<SerializedScriptValue> serializedScriptValue();
@@ -67,6 +70,7 @@ public:
     void set(); // For "null".
     void set(PassRefPtr<IDBDatabaseRequest>);
     void set(PassRefPtr<IDBIndexRequest>);
+    void set(PassRefPtr<IDBKey>);
     void set(PassRefPtr<IDBObjectStoreRequest>);
     void set(PassRefPtr<IndexedDatabaseRequest>);
     void set(PassRefPtr<SerializedScriptValue>);
@@ -79,6 +83,7 @@ private:
     // Only one of the following should ever be in use at any given time.
     RefPtr<IDBDatabaseRequest> m_idbDatabaseRequest;
     RefPtr<IDBIndexRequest> m_idbIndexRequest;
+    RefPtr<IDBKey> m_idbKey;
     RefPtr<IDBObjectStoreRequest> m_idbObjectStoreRequest;
     RefPtr<IndexedDatabaseRequest> m_indexedDatabaseRequest;
     RefPtr<SerializedScriptValue> m_serializedScriptValue;