[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 1279cc3a37bf46e80b160eb5997a83c5190b3afa
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 27 22:04:54 2009 +0000

    2009-10-27  Kinuko Yasuda  <kinuko at google.com>
    
            Reviewed by Darin Adler.
    
            Fixing a test case that yields FAIL results.  Also updating
            the corresponding expected results.
            https://bugs.webkit.org/show_bug.cgi?id=30821
    
            * storage/domstorage/complex-values-expected.txt:
            * storage/domstorage/script-tests/complex-values.js:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50176 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 901918e..d050d42 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-27  Kinuko Yasuda  <kinuko at google.com>
+
+        Reviewed by Darin Adler.
+
+        Fixing a test case that yields FAIL results.  Also updating
+        the corresponding expected results.
+        https://bugs.webkit.org/show_bug.cgi?id=30821
+
+        * storage/domstorage/complex-values-expected.txt:
+        * storage/domstorage/script-tests/complex-values.js:
+
 2009-10-27  Ryosuke Niwa  <rniwa at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/LayoutTests/storage/domstorage/complex-values-expected.txt b/LayoutTests/storage/domstorage/complex-values-expected.txt
index e6fa683..194b3b8 100644
--- a/LayoutTests/storage/domstorage/complex-values-expected.txt
+++ b/LayoutTests/storage/domstorage/complex-values-expected.txt
@@ -214,11 +214,11 @@ PASS storage.getItem('foo12') is "ÿ찡hello"
 Verify storage events are case sensitive
 storage.foo = 'test'
 Setting event listener
-FAIL eventCounter should be 0. Was 15.
+PASS eventCounter is 0
 storage.foo = 'test'
-FAIL eventCounter should be 0. Was 15.
+PASS eventCounter is 0
 storage.foo = 'TEST'
-FAIL eventCounter should be 1. Was 16.
+PASS eventCounter is 1
 PASS successfullyParsed is true
 
 TEST COMPLETE
diff --git a/LayoutTests/storage/domstorage/script-tests/complex-values.js b/LayoutTests/storage/domstorage/script-tests/complex-values.js
index f1ebad4..dea9db8 100644
--- a/LayoutTests/storage/domstorage/script-tests/complex-values.js
+++ b/LayoutTests/storage/domstorage/script-tests/complex-values.js
@@ -84,6 +84,10 @@ function test(storageString)
     shouldBe("eventCounter", "0");
     evalAndLog("storage.foo = 'TEST'");
     shouldBe("eventCounter", "1");
+
+    // Reset the counter for next tests (if any).
+    window.removeEventListener("storage", handleStorageEvent, false);
+    eventCounter = 0;
 }
 
 test("sessionStorage");

-- 
WebKit Debian packaging