Merge WebKit at r63173 : Initial merge by git.

Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44

2 files changed, 114 insertions, 9 deletions

diff --git a/LayoutTests/storage/indexeddb/idb-objectstore-request-expected.txt b/LayoutTests/storage/indexeddb/idb-objectstore-request-expected.txt
index bcf1d63..30bac34 100644
--- a/LayoutTests/storage/indexeddb/idb-objectstore-request-expected.txt
+++ b/LayoutTests/storage/indexeddb/idb-objectstore-request-expected.txt
@@ -3,12 +3,14 @@ Test IndexedDB's IDBObjectStoreRequest.
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
+indexedDB.open('name', 'description')
 PASS 'onsuccess' in result is true
 PASS 'onerror' in result is true
 PASS 'abort' in result is true
 PASS 'readyState' in result is true
 An event should fire shortly...
 
+openSuccess():
 Success event fired:
 PASS 'result' in event is true
 PASS 'code' in event is false
@@ -22,12 +24,14 @@ PASS 'readyState' in event.target is true
 PASS event.target.readyState is event.target.DONE
 
 db = event.result
+db.createObjectStore('storeName', null)
 PASS 'onsuccess' in result is true
 PASS 'onerror' in result is true
 PASS 'abort' in result is true
 PASS 'readyState' in result is true
 An event should fire shortly...
 
+createSuccess():
 Success event fired:
 PASS 'result' in event is true
 PASS 'code' in event is false
@@ -42,7 +46,72 @@ PASS event.target.readyState is event.target.DONE
 
 store = event.result
 PASS store.name is "storeName"
-PASS store.keyPath is "keyPath"
+PASS store.keyPath is null
+store.add('value', 'key')
+PASS 'onsuccess' in result is true
+PASS 'onerror' in result is true
+PASS 'abort' in result is true
+PASS 'readyState' in result is true
+An event should fire shortly...
+
+addSuccess():
+Success event fired:
+PASS 'result' in event is true
+PASS 'code' in event is false
+PASS 'message' in event is false
+PASS 'source' in event is true
+PASS event.source != null is true
+PASS 'onsuccess' in event.target is true
+PASS 'onerror' in event.target is true
+PASS 'abort' in event.target is true
+PASS 'readyState' in event.target is true
+PASS event.target.readyState is event.target.DONE
+
+PASS event.result is "key"
+store = event.source
+store.get('key')
+PASS 'onsuccess' in result is true
+PASS 'onerror' in result is true
+PASS 'abort' in result is true
+PASS 'readyState' in result is true
+An event should fire shortly...
+
+getSuccess():
+Success event fired:
+PASS 'result' in event is true
+PASS 'code' in event is false
+PASS 'message' in event is false
+PASS 'source' in event is true
+PASS event.source != null is true
+PASS 'onsuccess' in event.target is true
+PASS 'onerror' in event.target is true
+PASS 'abort' in event.target is true
+PASS 'readyState' in event.target is true
+PASS event.target.readyState is event.target.DONE
+
+PASS event.result is "value"
+store = event.source
+store.remove('key')
+PASS 'onsuccess' in result is true
+PASS 'onerror' in result is true
+PASS 'abort' in result is true
+PASS 'readyState' in result is true
+An event should fire shortly...
+
+removeSuccess():
+Success event fired:
+PASS 'result' in event is true
+PASS 'code' in event is false
+PASS 'message' in event is false
+PASS 'source' in event is true
+PASS event.source != null is true
+PASS 'onsuccess' in event.target is true
+PASS 'onerror' in event.target is true
+PASS 'abort' in event.target is true
+PASS 'readyState' in event.target is true
+PASS event.target.readyState is event.target.DONE
+
+PASS event.result is null
 PASS successfullyParsed is true
 
 TEST COMPLETE
diff --git a/LayoutTests/storage/indexeddb/script-tests/idb-objectstore-request.js b/LayoutTests/storage/indexeddb/script-tests/idb-objectstore-request.js
index 031ece6..045db12 100644
--- a/LayoutTests/storage/indexeddb/script-tests/idb-objectstore-request.js
+++ b/LayoutTests/storage/indexeddb/script-tests/idb-objectstore-request.js
@@ -4,7 +4,7 @@ if (window.layoutTestController)
 
 function test()
 {
-    result = indexedDB.open('name', 'description');
+    result = evalAndLog("indexedDB.open('name', 'description')");
     verifyResult(result);
     result.onsuccess = openSuccess;
     result.onerror = unexpectedErrorCallback;
@@ -12,17 +12,14 @@ function test()
 
 function openSuccess()
 {
+    debug("openSuccess():");
     verifySuccessEvent(event);
-
     var db = evalAndLog("db = event.result");
-    createObjectStore(db);
-}
 
-function createObjectStore(db)
-{
     // FIXME: remove any previously created object stores.
     // This requires IDBDatabaseRequest::removeObjectStore to be implemented.
-    result = db.createObjectStore('storeName', 'keyPath');
+
+    result = evalAndLog("db.createObjectStore('storeName', null)");
     verifyResult(result);
     result.onsuccess = createSuccess;
     result.onerror = unexpectedErrorCallback;
@@ -30,12 +27,51 @@ function createObjectStore(db)
 
 function createSuccess()
 {
+    debug("createSuccess():");
     verifySuccessEvent(event);
     var store = evalAndLog("store = event.result");
+
     shouldBeEqualToString("store.name", "storeName");
-    shouldBeEqualToString("store.keyPath", "keyPath");
+    shouldBeNull("store.keyPath");
     // FIXME: test store.indexNames, as well as all object store's methods.
 
+    result = evalAndLog("store.add('value', 'key')");
+    verifyResult(result);
+    result.onsuccess = addSuccess;
+    result.onerror = unexpectedErrorCallback;
+}
+
+function addSuccess()
+{
+    debug("addSuccess():");
+    verifySuccessEvent(event);
+    shouldBeEqualToString("event.result", "key");
+    var store = evalAndLog("store = event.source");
+
+    result = evalAndLog("store.get('key')");
+    verifyResult(result);
+    result.onsuccess = getSuccess;
+    result.onerror = unexpectedErrorCallback;
+}
+
+function getSuccess()
+{
+    debug("getSuccess():");
+    verifySuccessEvent(event);
+    shouldBeEqualToString("event.result", "value");
+    var store = evalAndLog("store = event.source");
+
+    result = evalAndLog("store.remove('key')");
+    verifyResult(result);
+    result.onsuccess = removeSuccess;
+    result.onerror = unexpectedErrorCallback;
+}
+
+function removeSuccess()
+{
+    debug("removeSuccess():");
+    verifySuccessEvent(event);
+    shouldBeNull("event.result");
     done();
 }