[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

Wed Dec 22 15:19:59 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit e884f4f8e54289dc6091d88802e78d2456ce1b2d
Author: jorlow at chromium.org <jorlow at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 1 14:26:27 2010 +0000

    2010-11-01  Jeremy Orlow  <jorlow at chromium.org>
    
            Reviewed by Steve Block.
    
            Fix IndexedDB layout test
            https://bugs.webkit.org/show_bug.cgi?id=48644
    
            This test needs to be async. Also clean up a few other things like
            using a logger div rather than document.write.
    
            * storage/indexeddb/tutorial-expected.txt:
            * storage/indexeddb/tutorial.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71020 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ba62cd3..158276b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-01  Jeremy Orlow  <jorlow at chromium.org>
+
+        Reviewed by Steve Block.
+
+        Fix IndexedDB layout test
+        https://bugs.webkit.org/show_bug.cgi?id=48644
+
+        This test needs to be async. Also clean up a few other things like
+        using a logger div rather than document.write.
+
+        * storage/indexeddb/tutorial-expected.txt:
+        * storage/indexeddb/tutorial.html:
+
 2010-11-01  Leandro Gracia Gil  <leandrogracia at google.com>
 
         Reviewed by Jeremy Orlow.
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>

-- 
WebKit Debian packaging

