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

Thu Apr 8 02:09:24 UTC 2010

The following commit has been merged in the webkit-1.2 branch:
commit 61ccc4b3fef1801f0d98eda647d50129f93e29f1
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 4 09:24:45 2010 +0000

    2010-03-04  John Abd-El-Malek  <jam at chromium.org>
    
            Reviewed by Adam Barth.
    
            Fix incorrect setup of DateExtension.
            https://bugs.webkit.org/show_bug.cgi?id=35710
    
            * fast/dom/Window/resources/slow_unload_handler1.html:
    2010-03-04  John Abd-El-Malek  <jam at chromium.org>
    
            Reviewed by Adam Barth.
    
            Fix incorrect setup of DateExtension.
            https://bugs.webkit.org/show_bug.cgi?id=35710
    
            * bindings/v8/DateExtension.cpp:
            (WebCore::DateExtension::setAllowSleep):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55513 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 92647bb..544dac8 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-04  John Abd-El-Malek  <jam at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Fix incorrect setup of DateExtension.
+        https://bugs.webkit.org/show_bug.cgi?id=35710
+
+        * fast/dom/Window/resources/slow_unload_handler1.html:
+
 2010-03-04  Oliver Hunt  <oliver at apple.com>
 
         Reviewed by Maciej Stachowiak.
diff --git a/LayoutTests/fast/dom/Window/resources/slow_unload_handler1.html b/LayoutTests/fast/dom/Window/resources/slow_unload_handler1.html
index 6b84e30..32d9fb0 100644
--- a/LayoutTests/fast/dom/Window/resources/slow_unload_handler1.html
+++ b/LayoutTests/fast/dom/Window/resources/slow_unload_handler1.html
@@ -1,8 +1,13 @@
 <html>
+<head>
 <script>
-function pause(milliseconds) {
+window.addEventListener('unload', nopause1, false);
+window.addEventListener('unload', nopause2, false);
+window.addEventListener('unload', pause, false);
+
+function pause() {
     var now = new Date();
-    var exitTime = now.getTime() + milliseconds;
+    var exitTime = now.getTime() + 10000;
     while (true) {
         now = new Date();
         if (now.getTime() > exitTime)
@@ -12,7 +17,24 @@ function pause(milliseconds) {
     if (layoutTestController)
         layoutTestController.notifyDone();
 }
+
+function nopause() {
+    try {
+        var time1 = (new Date()).getTime();
+    } catch(e) {
+        parent.document.getElementById("results").appendChild(document.createTextNode("FAIL"));
+        if (layoutTestController)
+            layoutTestController.notifyDone();
+    }
+}
+function nopause1() {
+    nopause();
+}
+
+function nopause2() {
+    nopause();
+}
 </script>
-<body onunload="pause(10000);">
-</body>
+</head>
+<body></body>
 </html>
\ No newline at end of file
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c7fea59..2994a35 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-04  John Abd-El-Malek  <jam at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Fix incorrect setup of DateExtension.
+        https://bugs.webkit.org/show_bug.cgi?id=35710
+
+        * bindings/v8/DateExtension.cpp:
+        (WebCore::DateExtension::setAllowSleep):
+
 2010-03-04  Oliver Hunt  <oliver at apple.com>
 
         Reviewed by Maciej Stachowiak.
diff --git a/WebCore/bindings/v8/DateExtension.cpp b/WebCore/bindings/v8/DateExtension.cpp
index abf8967..f2b6242 100644
--- a/WebCore/bindings/v8/DateExtension.cpp
+++ b/WebCore/bindings/v8/DateExtension.cpp
@@ -88,7 +88,7 @@ void DateExtension::setAllowSleep(bool allow)
         return;
 
     v8::Handle<v8::Value> argv[1];
-    argv[0] = v8::String::New(allow ? "false" : "true");
+    argv[0] = v8::Boolean::New(!allow);
     v8::Handle<v8::Function>::Cast(sleepFunctionHandle)->Call(v8::Object::New(), 1, argv);
 }
 

-- 
WebKit Debian packaging

