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

[eric at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 1121fda2ba7b80168f7bb3d68101392c1b9c7e77
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Aug 8 17:56:08 2010 +0000

    2010-08-08  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by Adam Barth.
    
            fast/events/onunload-back-to-page-cache.html does not pass with GTK DRT
            https://bugs.webkit.org/show_bug.cgi?id=43692
    
            Update onunload-back-to-page-cache.html to set the frame name later,
            so that the onunload handler console message doesn't have it. Also
            include a message about what exactly we're testing.
    
            * fast/events/onunload-back-to-page-cache-expected.txt:
            * fast/events/script-tests/onunload-back-to-page-cache.js:
            (onpageshow):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64953 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e645105..e88f60f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-08  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        fast/events/onunload-back-to-page-cache.html does not pass with GTK DRT
+        https://bugs.webkit.org/show_bug.cgi?id=43692
+        
+        Update onunload-back-to-page-cache.html to set the frame name later,
+        so that the onunload handler console message doesn't have it. Also 
+        include a message about what exactly we're testing.
+
+        * fast/events/onunload-back-to-page-cache-expected.txt:
+        * fast/events/script-tests/onunload-back-to-page-cache.js:
+        (onpageshow):
+
 2010-08-08  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/LayoutTests/fast/events/onunload-back-to-page-cache-expected.txt b/LayoutTests/fast/events/onunload-back-to-page-cache-expected.txt
index dbd38a3..a763bee 100644
--- a/LayoutTests/fast/events/onunload-back-to-page-cache-expected.txt
+++ b/LayoutTests/fast/events/onunload-back-to-page-cache-expected.txt
@@ -1,9 +1,10 @@
-main frame "navigated" - has 1 onunload handler(s)
+main frame - has 1 onunload handler(s)
 Simulates flow from a page that's in the page cache to one that's not, and then back to the page cached page.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
+PASS WebTiming asserts in FrameLoader.cpp did not fire
 PASS successfullyParsed is true
 
 TEST COMPLETE
diff --git a/LayoutTests/fast/events/script-tests/onunload-back-to-page-cache.js b/LayoutTests/fast/events/script-tests/onunload-back-to-page-cache.js
index 5ff0c89..f3051b9 100644
--- a/LayoutTests/fast/events/script-tests/onunload-back-to-page-cache.js
+++ b/LayoutTests/fast/events/script-tests/onunload-back-to-page-cache.js
@@ -2,12 +2,12 @@ description('Simulates flow from a page that\'s in the page cache to one that\'s
 
 onpageshow = function(event) {
     if (window.name == 'navigated') {
+        testPassed('WebTiming asserts in FrameLoader.cpp did not fire');
         finishJSTest();
     } else {
         if (window.layoutTestController)
             layoutTestController.overridePreference('WebKitUsesPageCachePreferenceKey', 1);
-        window.name = 'navigated';
-        setTimeout(function() {location.href = 'data:text/html,<script>onunload=function() {},onload=function(){history.back();}<' + '/script>';}, 0);
+        setTimeout(function() {location.href = 'data:text/html,<script>onunload=function() {},onload=function(){window.name = \'navigated\';history.back();}<' + '/script>';}, 0);
     }
 }
 

-- 
WebKit Debian packaging