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

Wed Dec 22 12:45:18 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit d1d06393e82a392e194860a21e9b435b4816c028
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 28 19:34:00 2010 +0000

    2010-08-28  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by Tony Chang.
    
            fast/frames/frame-crash-with-page-cache.html does not pass on Chromium
            https://bugs.webkit.org/show_bug.cgi?id=44813
    
            Update test to not rely on intervals resuming when going back to a page
            in the page cache. Based on the original bug for which this test was
            added (34773), intervals were not part of the triggering condition.
    
            * fast/frames/resources/cached-page-1.html:
            * fast/frames/resources/cached-page-2.html:
            * platform/chromium/test_expectations.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66312 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0c6f3e9..b165cbd 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-28  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by Tony Chang.
+
+        fast/frames/frame-crash-with-page-cache.html does not pass on Chromium
+        https://bugs.webkit.org/show_bug.cgi?id=44813
+
+        Update test to not rely on intervals resuming when going back to a page
+        in the page cache. Based on the original bug for which this test was
+        added (34773), intervals were not part of the triggering condition.
+
+        * fast/frames/resources/cached-page-1.html:
+        * fast/frames/resources/cached-page-2.html:
+        * platform/chromium/test_expectations.txt:
+
 2010-08-28  Eric Carlson  <eric.carlson at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/LayoutTests/fast/frames/resources/cached-page-1.html b/LayoutTests/fast/frames/resources/cached-page-1.html
index 2715102..ffb0cd3 100644
--- a/LayoutTests/fast/frames/resources/cached-page-1.html
+++ b/LayoutTests/fast/frames/resources/cached-page-1.html
@@ -1,8 +1,6 @@
 <html>
 <head>
 <script>
-var intervalId;
-
 function endTest() {
     window.opener.log("PASS.");
     window.opener.finish();
@@ -14,8 +12,6 @@ function loadNext() {
         return;
     }
 
-    intervalId = setInterval(endTest, 100);
-
     window.opener.log("page-1, about to navigate to page-2.")
     // Location changes need to happen outside the onload handler to generate history entries.
     setTimeout(function() {location.href = "cached-page-2.html";}, 0);
diff --git a/LayoutTests/fast/frames/resources/cached-page-2.html b/LayoutTests/fast/frames/resources/cached-page-2.html
index b159242..e3c975d 100644
--- a/LayoutTests/fast/frames/resources/cached-page-2.html
+++ b/LayoutTests/fast/frames/resources/cached-page-2.html
@@ -1,28 +1,25 @@
 <script>
-var intervalId;
-
 function goBack() {
-    if (!window.opener.canExit3)
-        return;
-
-    clearInterval(intervalId);
     window.opener.log("Back on page-2, timer is still firing.");
     history.back();
 }
 
 function loadNext() {
+    if (window.opener.canExit3) {
+        goBack();
+        return;
+    }
+
     window.opener.canExit2 = true;
 
     // The crash only happens when we scroll here!
     window.scrollBy(0, 100);
 
-    intervalId = setInterval(goBack, 20);
-
     window.opener.log("page-2, about to navigate to page-3.")
     // Location changes need to happen outside the onload handler to generate history entries.
     setTimeout(function() {location.href = "cached-page-3.html";}, 0);
 }
 </script>
-<body onload="loadNext()">
+<body onpageshow="loadNext()">
 <div style="height: 1200px; background-color: green"></div>
 </body>
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index a75041a..5c0a83c 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -179,7 +179,6 @@ WONTFIX SKIP BUG19635 : fast/events/pageshow-pagehide-on-back-cached-with-frames
 WONTFIX SKIP BUG19635 : media/restore-from-page-cache.html = TIMEOUT
 WONTFIX SKIP BUG19635 : loader/go-back-to-different-window-size.html = TIMEOUT TEXT
 WONTFIX SKIP BUG19635 : fast/loader/crash-copying-backforwardlist.html = TEXT
-WONTFIX SKIP BUG19635 : fast/frames/frame-crash-with-page-cache.html = TEXT
 WONTFIX SKIP BUG19635 : fast/harness/page-cache-crash-on-data-urls.html = TEXT
 
 // Tests that rely on cross-process MessagePorts.  No point in running them in

-- 
WebKit Debian packaging

