[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

Sun Feb 20 23:26:28 UTC 2011

The following commit has been merged in the webkit-1.3 branch:
commit 5122395960b628dda935ef26f1ca44c72d1919a6
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 20 15:38:09 2011 +0000

    2011-01-20  Yury Semikhatsky  <yurys at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Make fast/events/window-onerror2.html throw exception in deterministic order
            https://bugs.webkit.org/show_bug.cgi?id=52813
    
            * fast/events/window-onerror2-expected.txt:
            * fast/events/window-onerror2.html: call setTimeout from onload handler to make sure exception
            in the onload handler will be processed before the one in the setTimeout callback
            * platform/chromium/fast/events/window-onerror2-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76244 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 30cce09..2d78244 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-20  Yury Semikhatsky  <yurys at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Make fast/events/window-onerror2.html throw exception in deterministic order
+        https://bugs.webkit.org/show_bug.cgi?id=52813
+
+        * fast/events/window-onerror2-expected.txt:
+        * fast/events/window-onerror2.html: call setTimeout from onload handler to make sure exception
+        in the onload handler will be processed before the one in the setTimeout callback
+        * platform/chromium/fast/events/window-onerror2-expected.txt:
+
 2011-01-20  Philippe Normand  <pnormand at igalia.com>
 
         Unreviewed, new GTK svg test baselines as follow-up of r76236.
diff --git a/LayoutTests/fast/events/window-onerror2-expected.txt b/LayoutTests/fast/events/window-onerror2-expected.txt
index 93a2d3f..4db9e62 100644
--- a/LayoutTests/fast/events/window-onerror2-expected.txt
+++ b/LayoutTests/fast/events/window-onerror2-expected.txt
@@ -1,6 +1,6 @@
 Test that uncaught exceptions will be reported to the window.onerror handler. Bug 8519.
 
-Main frame window.onerror: Error: Inline script exception at window-onerror2.html:35
+Main frame window.onerror: Error: Inline script exception at window-onerror2.html:34
 Main frame window.onerror: Exception in onload at undefined:0
 Main frame window.onerror: Error: Exception in setTimeout at window-onerror2.html:29
 
diff --git a/LayoutTests/fast/events/window-onerror2.html b/LayoutTests/fast/events/window-onerror2.html
index db9fb75..8f458bc 100644
--- a/LayoutTests/fast/events/window-onerror2.html
+++ b/LayoutTests/fast/events/window-onerror2.html
@@ -1,5 +1,5 @@
 <html>
-<body onload="throw 'Exception in onload';">
+<body onload="setTimeout(delayedThrowException, 0); throw 'Exception in onload';">
 <p>Test that uncaught exceptions will be reported to the window.onerror handler. <a href="https://bugs.webkit.org/show_bug.cgi?id=8519">Bug 8519</a>.</p>
 <div id="result"></div>
 <script>
@@ -28,7 +28,6 @@ function delayedThrowException()
 {
     throw new Error("Exception in setTimeout");
 }
-setTimeout(delayedThrowException, 0);
 
 function throwException()
 {
diff --git a/LayoutTests/platform/chromium/fast/events/window-onerror2-expected.txt b/LayoutTests/platform/chromium/fast/events/window-onerror2-expected.txt
index f7b1621..66177a7 100644
--- a/LayoutTests/platform/chromium/fast/events/window-onerror2-expected.txt
+++ b/LayoutTests/platform/chromium/fast/events/window-onerror2-expected.txt
@@ -1,6 +1,6 @@
 Test that uncaught exceptions will be reported to the window.onerror handler. Bug 8519.
 
-Main frame window.onerror: Uncaught Error: Inline script exception at window-onerror2.html:35
+Main frame window.onerror: Uncaught Error: Inline script exception at window-onerror2.html:34
 Main frame window.onerror: Uncaught Exception in onload at window-onerror2.html:2
 Main frame window.onerror: Uncaught Error: Exception in setTimeout at window-onerror2.html:29
 

-- 
WebKit Debian packaging

