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

darin at chromium.org darin at chromium.org
Wed Dec 22 11:37:16 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit b14fd5c0aedad6a8ccf6d758e295e3629b88ab8c
Author: darin at chromium.org <darin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jul 31 04:01:10 2010 +0000

    2010-07-30  Darin Fisher  <darin at chromium.org>
    
            Fix layout test oops.
    
            * fast/loader/stateobjects/resources/pushstate-in-iframe-child.html:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64404 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 38ee360..ef4b01d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,11 @@
 2010-07-30  Darin Fisher  <darin at chromium.org>
 
+        Fix layout test oops.
+
+        * fast/loader/stateobjects/resources/pushstate-in-iframe-child.html:
+
+2010-07-30  Darin Fisher  <darin at chromium.org>
+
         Reviewed by Darin Adler.
 
         Eliminate BackForwardList::pushStateItem
diff --git a/LayoutTests/fast/loader/stateobjects/resources/pushstate-in-iframe-child.html b/LayoutTests/fast/loader/stateobjects/resources/pushstate-in-iframe-child.html
index 158dcc8..885fcd2 100644
--- a/LayoutTests/fast/loader/stateobjects/resources/pushstate-in-iframe-child.html
+++ b/LayoutTests/fast/loader/stateobjects/resources/pushstate-in-iframe-child.html
@@ -4,14 +4,15 @@ onunload = function() {
 }
 
 onpopstate = function() {
+  var topWin = top;
   // Verify that we are still in an iframe
-  if (top == window) {
-    top.document.body.innerHTML = "FAIL";
+  if (topWin == window) {
+    topWin.document.body.innerHTML = "FAIL";
   } else {
-    top.document.body.innerHTML = "PASS";
+    topWin.document.body.innerHTML = "PASS";
   }
-  if (window.layoutTestController)
-    layoutTestController.notifyDone();
+  if (topWin.layoutTestController)
+    topWin.layoutTestController.notifyDone();
 }
 
 onload = function() {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list