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

Wed Dec 22 12:46:31 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit acc4bb37f4f3ffe1034095770c2e376995a04308
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Aug 29 23:56:40 2010 +0000

    2010-08-29  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by Tony Chang.
    
            fast/loader/input-element-page-cache-crash.html fails on Chromium
            https://bugs.webkit.org/show_bug.cgi?id=44811
    
            Make test not rely on page cache behavior (window.finishTest being
            persisted), instead use sessionStorage.
    
            * fast/loader/input-element-page-cache-crash.html:
            * platform/chromium/test_expectations.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66340 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0dbf053..b107c3a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-29  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by Tony Chang.
+
+        fast/loader/input-element-page-cache-crash.html fails on Chromium
+        https://bugs.webkit.org/show_bug.cgi?id=44811
+
+        Make test not rely on page cache behavior (window.finishTest being
+        persisted), instead use sessionStorage.
+
+        * fast/loader/input-element-page-cache-crash.html:
+        * platform/chromium/test_expectations.txt:
+
 2010-08-29  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/LayoutTests/fast/loader/input-element-page-cache-crash-expected.txt b/LayoutTests/fast/loader/input-element-page-cache-crash-expected.txt
index 2ab5e35..4f13cc5 100644
--- a/LayoutTests/fast/loader/input-element-page-cache-crash-expected.txt
+++ b/LayoutTests/fast/loader/input-element-page-cache-crash-expected.txt
@@ -1,3 +1,5 @@
+CONSOLE MESSAGE: line 24: navigating away
+CONSOLE MESSAGE: line 35: navigated back
 This test has an input element that starts out with autocomplete=off.
 It then changes autocomplete to on.
 It then removes the element so it is destroyed.
diff --git a/LayoutTests/fast/loader/input-element-page-cache-crash.html b/LayoutTests/fast/loader/input-element-page-cache-crash.html
index 2493272..891d941 100644
--- a/LayoutTests/fast/loader/input-element-page-cache-crash.html
+++ b/LayoutTests/fast/loader/input-element-page-cache-crash.html
@@ -20,19 +20,30 @@ function runTest()
 
 function pageHidden()
 {
-    window.finishTest = true;
+    if (!sessionStorage.finishTest) {
+        console.log('navigating away');
+        sessionStorage.finishTest = true;
+    } else {
+        // Clean up after ourselves
+        delete sessionStorage.finishTest;
+    }
 }
 
 function pageShown()
 {
-    if (window.layoutTestController && window.finishTest)
-        layoutTestController.notifyDone();
+    if (sessionStorage.finishTest) {
+        console.log('navigated back');
+        if (window.layoutTestController)
+            layoutTestController.notifyDone();
+    } else {
+        runTest();
+    }
 }
 
 </script>    
 </head>
 
-<body onload="runTest();" onpagehide="pageHidden();" onpageshow="pageShown();">
+<body onpagehide="pageHidden();" onpageshow="pageShown();">
 <pre>This test has an input element that starts out with autocomplete=off.
 It then changes autocomplete to on.
 It then removes the element so it is destroyed.
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 5c0a83c..5dab341 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2307,12 +2307,6 @@ BUG29737 MAC : svg/custom/use-elementInstance-event-target.svg = IMAGE
 BUG29737 MAC : svg/W3C-SVG-1.1/struct-image-02-b.svg = IMAGE
 BUG29737 MAC : svg/filters/sourceAlpha.svg = IMAGE
 
-// More Webkit Roll to r51875
-
-// WebKit Roll to r51915
-BUG29930 : fast/loader/input-element-page-cache-crash.html = TIMEOUT PASS TEXT
-
-
 // New tests courtesy of: http://trac.webkit.org/changeset/51936:
 BUG30048 : svg/css/composite-shadow-example.html = IMAGE
 BUG30048 : svg/css/composite-shadow-with-opacity.html = IMAGE

-- 
WebKit Debian packaging

