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

Wed Dec 22 15:16:54 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 4ca94e7550e14d3f1fe87834908ae2b796e344f7
Author: mihaip at chromium.org <mihaip at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 29 19:00:30 2010 +0000

    2010-10-29  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by Tony Chang.
    
            [Chromium] fast/loader/stateobjects/state-api-on-detached-frame-crash.html does not pass on Chromium
            https://bugs.webkit.org/show_bug.cgi?id=48647
    
            Chromium throws an exception if calling push/replaceState on a detached
            frame, while the mac port fails silently (presumably a JSC vs. V8
            difference). Either behavior is correct (as long as we don't crash),
            make the test handle both.
    
            * fast/loader/stateobjects/state-api-on-detached-frame-crash-expected.txt:
            * fast/loader/stateobjects/state-api-on-detached-frame-crash.html:
            * platform/chromium/test_expectations.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70913 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e3e5854..72ee1ed 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2010-10-29  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by Tony Chang.
+
+        [Chromium] fast/loader/stateobjects/state-api-on-detached-frame-crash.html does not pass on Chromium
+        https://bugs.webkit.org/show_bug.cgi?id=48647
+        
+        Chromium throws an exception if calling push/replaceState on a detached
+        frame, while the mac port fails silently (presumably a JSC vs. V8 
+        difference). Either behavior is correct (as long as we don't crash),
+        make the test handle both.
+
+        * fast/loader/stateobjects/state-api-on-detached-frame-crash-expected.txt:
+        * fast/loader/stateobjects/state-api-on-detached-frame-crash.html:
+        * platform/chromium/test_expectations.txt:
+
 2010-10-29  Oliver Hunt  <oliver at apple.com>
 
         Reviewed by Gavin Barraclough.
diff --git a/LayoutTests/fast/loader/stateobjects/state-api-on-detached-frame-crash-expected.txt b/LayoutTests/fast/loader/stateobjects/state-api-on-detached-frame-crash-expected.txt
index 8b13789..a54edbf 100644
--- a/LayoutTests/fast/loader/stateobjects/state-api-on-detached-frame-crash-expected.txt
+++ b/LayoutTests/fast/loader/stateobjects/state-api-on-detached-frame-crash-expected.txt
@@ -1 +1,2 @@
-
+Tests that calling pushState or replaceState on a detached frame doesn't crash.
+PASSED
diff --git a/LayoutTests/fast/loader/stateobjects/state-api-on-detached-frame-crash.html b/LayoutTests/fast/loader/stateobjects/state-api-on-detached-frame-crash.html
index d9e7a2e..bb71bf7 100644
--- a/LayoutTests/fast/loader/stateobjects/state-api-on-detached-frame-crash.html
+++ b/LayoutTests/fast/loader/stateobjects/state-api-on-detached-frame-crash.html
@@ -8,13 +8,24 @@ function runTest()
 {
     var ifr = frames[0];
     document.body.removeChild(document.getElementsByTagName("iframe")[0])
-    ifr.history.replaceState("foo", "bar");
-    ifr.history.pushState("fu", "barred");
+    try {
+        ifr.history.replaceState("foo", "bar");
+    } catch (e) {
+      // Ignore, expected
+    }
+    try {
+        ifr.history.pushState("fu", "barred");
+    } catch (e) {
+      // Ignore, expected    
+    }
+    document.getElementById("log").textContent = "PASSED";
 }
 
 </script>
 <body onload="runTest();">
+Tests that calling <code>pushState</code> or <code>replaceState</code> on a detached frame doesn't crash.
 <iframe src="about:blank">
 </iframe>
+<pre id="log"></pre>
 </body>
 </html>
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 7a12d81..8df55cc 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2190,9 +2190,6 @@ BUG29167 MAC DEBUG : fast/dom/replaceChild.html = IMAGE PASS
 // Failure from WebKit merge 51607:51613 (51608 is the cause)
 BUG29239 LINUX WIN : fast/css/variables/misplaced-import-test.html = FAIL
 
-// Failures from WebKit merge 51642:51681
-BUG29393 : fast/loader/stateobjects/state-api-on-detached-frame-crash.html = TEXT
-
 // Failures introduced by USE_NEW_BUILDER in Skia.
 BUG33287 WIN LINUX : fast/canvas/set-colors.html = TEXT
 

-- 
WebKit Debian packaging

