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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 35a072e1ffc221abd1cb3849136775d27f8f696f
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 9 05:18:29 2010 +0000

    2010-09-08  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            pushstate-clears-forward-history.html crashes with Chromium DRT
            https://bugs.webkit.org/show_bug.cgi?id=45351
    
            pushstate-clears-forward-history.html would appear to crash with the
            Chromium DRT. The crash was actually caused by the test that preceded
            it, popstate-fires-with-page-cache.html, added with r66628. That test
            would close a popup window during a popstate event handler, triggering
            bug 36202 (popstate fires sychronously instead of asynchronously),
            leading to asserts firing.
    
            The workaround is to simulate popstate being async by wrapping the
            cleanup code in a timeout (fixing 36202 itself is also on my radar).
    
            * fast/loader/stateobjects/popstate-fires-with-page-cache.html:
            * platform/chromium/drt_expectations.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67060 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 025d916..de77767 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,23 @@
+2010-09-08  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        pushstate-clears-forward-history.html crashes with Chromium DRT
+        https://bugs.webkit.org/show_bug.cgi?id=45351
+
+        pushstate-clears-forward-history.html would appear to crash with the
+        Chromium DRT. The crash was actually caused by the test that preceded
+        it, popstate-fires-with-page-cache.html, added with r66628. That test
+        would close a popup window during a popstate event handler, triggering
+        bug 36202 (popstate fires sychronously instead of asynchronously), 
+        leading to asserts firing.
+        
+        The workaround is to simulate popstate being async by wrapping the
+        cleanup code in a timeout (fixing 36202 itself is also on my radar).
+
+        * fast/loader/stateobjects/popstate-fires-with-page-cache.html:
+        * platform/chromium/drt_expectations.txt:
+
 2010-09-08  MORITA Hajime <morrita at google.com>
 
         Unreviewed, Added 1 test failures on Win to test_expectations.txt
diff --git a/LayoutTests/fast/loader/stateobjects/popstate-fires-with-page-cache.html b/LayoutTests/fast/loader/stateobjects/popstate-fires-with-page-cache.html
index 6492cf4..188cdc0 100644
--- a/LayoutTests/fast/loader/stateobjects/popstate-fires-with-page-cache.html
+++ b/LayoutTests/fast/loader/stateobjects/popstate-fires-with-page-cache.html
@@ -45,8 +45,12 @@ function onTestWindowPopState(event)
             setTimeout(function() {testWindow.history.back();}, 0);
             break;
         case 4:
-            testWindow.close();
-            finishJSTest();        
+            // Close the window in a timeout to simulate popstate firing asynchronously, otherwise closing the window in a popstate handler results in a crash.
+            // FIXME: remove this when http://webkit.org/b/36202 is fixed.
+            setTimeout(function() {
+                testWindow.close();
+                finishJSTest();
+            }, 0);
             break;
         default:
             testFailed('unexpected pop state event state');
diff --git a/LayoutTests/platform/chromium/drt_expectations.txt b/LayoutTests/platform/chromium/drt_expectations.txt
index 7da8157..60bafc6 100644
--- a/LayoutTests/platform/chromium/drt_expectations.txt
+++ b/LayoutTests/platform/chromium/drt_expectations.txt
@@ -141,7 +141,6 @@ BUG_DRT : platform/chromium/accessibility/children-changed-notification.html = P
 BUG_DRT LINUX : fast/text/international/thai-line-breaks.html = IMAGE
 BUG_DRT WIN : svg/batik/text/textFeatures.svg = IMAGE
 BUG_DRT WIN MAC LINUX : media/media-can-play-mpeg4-video.html = TEXT
-BUG_DRT WIN MAC LINUX : fast/loader/stateobjects/pushstate-clears-forward-history.html = CRASH
 BUG_DRT WIN : http/tests/xmlhttprequest/redirect-cross-origin-tripmine.html = CRASH
 BUG_DRT WIN MAC LINUX : storage/indexeddb/objectstore-basics.html = TEXT
 BUG_DRT WIN : fast/forms/search-styled.html = TEXT

-- 
WebKit Debian packaging