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

[beidson at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 2e4141b0fdba929ce1741f6f238520babe57b582
Author: beidson at apple.com <beidson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 3 21:19:38 2009 +0000

    Rubberstamped by Oliver Hunt.
    
    Fix layout tests by removing the full outputting of the Date object and just outputting the milliseconds since the epoch.
    
    * fast/loader/stateobjects/pushstate-object-types-expected.txt:
    * fast/loader/stateobjects/pushstate-object-types.html:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51655 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 30efdcf..b4ee376 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-03  Brady Eidson  <beidson at apple.com>
+
+        Rubberstamped by Oliver Hunt.
+
+        Fix layout tests by removing the full outputting of the Date object and just outputting the milliseconds since the epoch.
+
+        * fast/loader/stateobjects/pushstate-object-types-expected.txt:
+        * fast/loader/stateobjects/pushstate-object-types.html:
+
 2009-12-03  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Eric Seidel.
diff --git a/LayoutTests/fast/loader/stateobjects/pushstate-object-types-expected.txt b/LayoutTests/fast/loader/stateobjects/pushstate-object-types-expected.txt
index 5952194..910b795 100644
--- a/LayoutTests/fast/loader/stateobjects/pushstate-object-types-expected.txt
+++ b/LayoutTests/fast/loader/stateobjects/pushstate-object-types-expected.txt
@@ -4,7 +4,7 @@ State popped - [object Object] (type object)
 State popped - [object Object] (type object)
 State popped -  (type object)
 State popped - null (type object)
-State popped - Wed Dec 31 1969 16:00:00 GMT-0800 (PST) (type object)
+State popped - 0 (type object)
 State popped - String (type string)
 State popped - 42 (type number)
 State popped - true (type boolean)
diff --git a/LayoutTests/fast/loader/stateobjects/pushstate-object-types.html b/LayoutTests/fast/loader/stateobjects/pushstate-object-types.html
index 8f31981..3992c4d 100644
--- a/LayoutTests/fast/loader/stateobjects/pushstate-object-types.html
+++ b/LayoutTests/fast/loader/stateobjects/pushstate-object-types.html
@@ -41,7 +41,12 @@ history.pushState([FileList], "FileList entry");
 
 function statePopped()
 {
-    log("State popped - " + event.state + " (type " + typeof event.state + ")");
+    if (event.state instanceof Date)
+        log("State popped - " + event.state * 1 + " (type " + typeof event.state + ")");
+    else
+        log("State popped - " + event.state + " (type " + typeof event.state + ")");
+
+    
     if (event.state != "FirstEntry")
         history.back();
     else if (window.layoutTestController)

-- 
WebKit Debian packaging