Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

1 files changed, 16 insertions, 126 deletions

diff --git a/LayoutTests/storage/indexeddb/transaction-basics-expected.txt b/LayoutTests/storage/indexeddb/transaction-basics-expected.txt
index f026154..527c553 100644
--- a/LayoutTests/storage/indexeddb/transaction-basics-expected.txt
+++ b/LayoutTests/storage/indexeddb/transaction-basics-expected.txt
@@ -5,63 +5,17 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 PASS 'webkitIndexedDB' in window is true
 PASS webkitIndexedDB == null is false
-webkitIndexedDB.open('name')
-PASS 'onsuccess' in result is true
-PASS 'onerror' in result is true
-PASS 'readyState' in result is true
-An event should fire shortly...
-
+webkitIndexedDB.open('transaction-basics')
 openSuccess():
-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 'readyState' in event.target is true
-PASS event.target.readyState is event.target.DONE
-
-db = event.result
-result = db.setVersion('version 1')
-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 'readyState' in event.target is true
-PASS event.target.readyState is event.target.DONE
-
+db = event.target.result
+request = db.setVersion('version 1')
 Deleted all object stores.
 PASS window.db.objectStoreNames is []
 PASS window.db.objectStoreNames.length is 0
 PASS window.db.objectStoreNames.contains('storeFail') is false
-PASS window.db.objectStoreNames is []
-PASS window.db.objectStoreNames.length is 0
-PASS window.db.objectStoreNames.contains('storeFail') is false
-result = startSetVersion('version fail')
-PASS 'onsuccess' in result is true
-PASS 'onerror' in result is true
-PASS 'readyState' in result is true
-An event should fire shortly...
-
+request = startSetVersion('version fail')
 addRemoveIDBObjects():
-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 'readyState' in event.target is true
-PASS event.target.readyState is event.target.DONE
-
-trans = event.result
+trans = event.target.result
 PASS trans !== null is true
 store = db.createObjectStore('storeFail', null)
 index = store.createIndex('indexFail', 'x', false)
@@ -70,25 +24,9 @@ store.deleteIndex('indexFail')
 PASS window.db.objectStoreNames is []
 PASS window.db.objectStoreNames.length is 0
 PASS window.db.objectStoreNames.contains('storeFail') is false
-result = startSetVersion('version fail')
-PASS 'onsuccess' in result is true
-PASS 'onerror' in result is true
-PASS 'readyState' in result is true
-An event should fire shortly...
-
+request = startSetVersion('version fail')
 addRemoveAddIDBObjects():
-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 'readyState' in event.target is true
-PASS event.target.readyState is event.target.DONE
-
-trans = event.result
+trans = event.target.result
 PASS trans !== null is true
 store = db.createObjectStore('storeFail', null)
 index = store.createIndex('indexFail', 'x', false)
@@ -96,53 +34,22 @@ db.deleteObjectStore('storeFail')
 store.deleteIndex('indexFail')
 store = db.createObjectStore('storeFail', null)
 index = store.createIndex('indexFail', 'x', false)
+PASS event.cancelable is false
 PASS window.db.objectStoreNames is []
 PASS window.db.objectStoreNames.length is 0
 PASS window.db.objectStoreNames.contains('storeFail') is false
-result = startSetVersion('version fail')
-PASS 'onsuccess' in result is true
-PASS 'onerror' in result is true
-PASS 'readyState' in result is true
-An event should fire shortly...
-
+request = startSetVersion('version fail')
 addIDBObjects():
-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 'readyState' in event.target is true
-PASS event.target.readyState is event.target.DONE
-
-trans = event.result
+trans = event.target.result
 PASS trans !== null is true
 store = db.createObjectStore('storeFail', null)
 index = store.createIndex('indexFail', 'x', false)
 PASS db.objectStoreNames is ['storeFail']
 PASS db.objectStoreNames.length is 1
 PASS db.objectStoreNames.contains('storeFail') is true
-result = startSetVersion('version fail')
-PASS 'onsuccess' in result is true
-PASS 'onerror' in result is true
-PASS 'readyState' in result is true
-An event should fire shortly...
-
+request = startSetVersion('version fail')
 removeIDBObjects():
-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 'readyState' in event.target is true
-PASS event.target.readyState is event.target.DONE
-
-trans = event.result
+trans = event.target.result
 PASS trans !== null is true
 store = trans.objectStore('storeFail')
 store.deleteIndex('indexFail')
@@ -151,34 +58,17 @@ PASS db.objectStoreNames is ['storeFail']
 PASS db.objectStoreNames.length is 1
 PASS db.objectStoreNames.contains('storeFail') is true
 db.setVersion('new version')
-PASS 'onsuccess' in result is true
-PASS 'onerror' in result is true
-PASS 'readyState' in result is true
-An event should fire shortly...
-
 setVersionSuccess():
-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 'readyState' in event.target is true
-PASS event.target.readyState is event.target.DONE
-
-trans = event.result
+trans = event.target.result
 PASS trans !== null is true
 Deleted all object stores.
 db.createObjectStore('storeName', null)
 db.transaction({mode: webkitIDBTransaction.READ_WRITE})
 store = transaction.objectStore('storeName')
 PASS store.name is "storeName"
-Abort event fired:
-PASS event.type is "abort"
-Complete event fired:
-PASS event.type is "complete"
+PASS complete event fired
+PASS event.cancelable is false
+PASS complete event fired
 PASS oncomplete event had fired
 PASS successfullyParsed is true