summaryrefslogtreecommitdiffstats
path: root/LayoutTests/storage
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2010-11-10 15:31:59 -0800
committerTeng-Hui Zhu <ztenghui@google.com>2010-11-17 13:35:59 -0800
commit28040489d744e0c5d475a88663056c9040ed5320 (patch)
treec463676791e4a63e452a95f0a12b2a8519730693 /LayoutTests/storage
parenteff9be92c41913c92fb1d3b7983c071f3e718678 (diff)
downloadexternal_webkit-28040489d744e0c5d475a88663056c9040ed5320.zip
external_webkit-28040489d744e0c5d475a88663056c9040ed5320.tar.gz
external_webkit-28040489d744e0c5d475a88663056c9040ed5320.tar.bz2
Merge WebKit at r71558: Initial merge by git.
Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
Diffstat (limited to 'LayoutTests/storage')
-rw-r--r--LayoutTests/storage/indexeddb/tutorial-expected.txt4
-rw-r--r--LayoutTests/storage/indexeddb/tutorial.html10
2 files changed, 10 insertions, 4 deletions
diff --git a/LayoutTests/storage/indexeddb/tutorial-expected.txt b/LayoutTests/storage/indexeddb/tutorial-expected.txt
index 1e424ef..f9175b7 100644
--- a/LayoutTests/storage/indexeddb/tutorial-expected.txt
+++ b/LayoutTests/storage/indexeddb/tutorial-expected.txt
@@ -1,2 +1,4 @@
-All done!
+Please view source for more information on what this is doing and why...
+
+Everything worked!
diff --git a/LayoutTests/storage/indexeddb/tutorial.html b/LayoutTests/storage/indexeddb/tutorial.html
index 2e7e41f..db9f2fa 100644
--- a/LayoutTests/storage/indexeddb/tutorial.html
+++ b/LayoutTests/storage/indexeddb/tutorial.html
@@ -24,8 +24,10 @@
// goal of teaching people IndexedDB. That said, it does have a good amount of coverage and
// serves as a living document describing what's expected to work and how within WebKit so it
// seems well worth having checked in.
-if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
+}
function setup()
@@ -51,7 +53,7 @@ function setup()
function log(txt)
{
- document.write(txt + "<br>");
+ document.getElementById("logger").innerHTML += txt + "<br>";
}
function logError(txt)
@@ -394,6 +396,7 @@ function onIndexGetSuccess()
function onAllDone()
{
log("Everything worked!");
+ layoutTestController.notifyDone();
}
// The way setVersion is supposed to work:
@@ -429,5 +432,6 @@ function onAllDone()
</script>
<body onload="start()">
Please view source for more information on what this is doing and why...<br><br>
+<div id="logger"></div>
</body>
</html>