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

[jamesr at google.com]

The following commit has been merged in the debian/experimental branch:
commit 3d583f924c6eddc83b524b71898d0d67f4d1d569
Author: jamesr at google.com <jamesr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 9 02:50:38 2010 +0000

    2010-09-08  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by James Robinson.
    
            http/tests/navigation/anchor-frames.html doesn't pass with TestShell
            https://bugs.webkit.org/show_bug.cgi?id=45430
    
            Check scroll position in a timeout, otherwise TestShell will report 0
            for it.
    
            * http/tests/navigation/resources/frame-with-anchor.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67051 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 63cb892..be4f6a3 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-08  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by James Robinson.
+
+        http/tests/navigation/anchor-frames.html doesn't pass with TestShell
+        https://bugs.webkit.org/show_bug.cgi?id=45430
+
+        Check scroll position in a timeout, otherwise TestShell will report 0
+        for it.
+
+        * http/tests/navigation/resources/frame-with-anchor.html:
+
 2010-09-08  Maciej Stachowiak  <mjs at apple.com>
 
         Not reviewed, fixing trivial typo.
diff --git a/LayoutTests/http/tests/navigation/resources/frame-with-anchor.html b/LayoutTests/http/tests/navigation/resources/frame-with-anchor.html
index 177b100..3be5d81 100644
--- a/LayoutTests/http/tests/navigation/resources/frame-with-anchor.html
+++ b/LayoutTests/http/tests/navigation/resources/frame-with-anchor.html
@@ -7,17 +7,21 @@
     function runTest() {
       description('Tests that loading a frame with a URL that contains a fragment pointed at a named anchor actually scrolls to that anchor.');
 
-      // Make sure that the body is taller than the viewport (i.e. scrolling is
-      // required).
-      shouldBeTrue('document.body.offsetHeight > document.documentElement.clientHeight');
-      
-      // We should be scrolled at least a little bit
-      shouldBeTrue('document.body.scrollTop > 0');
-      
-      // And the bottom of the viewable area should be at least 2000 pixels from the top, due to the spacer element above.
-      shouldBeTrue('document.body.scrollTop + document.documentElement.clientHeight > 2000');
-      
-      finishJSTest();
+      // Check scroll position in a timeout to make sure that the anchor has
+      // been scrolled to.
+      setTimeout(function() {
+          // Make sure that the body is taller than the viewport (i.e. scrolling is
+          // required).
+          shouldBeTrue('document.body.offsetHeight > document.documentElement.clientHeight');
+          
+          // We should be scrolled at least a little bit
+          shouldBeTrue('document.body.scrollTop > 0');
+          
+          // And the bottom of the viewable area should be at least 2000 pixels from the top, due to the spacer element above.
+          shouldBeTrue('document.body.scrollTop + document.documentElement.clientHeight > 2000');
+          
+          finishJSTest();          
+      }, 0);
     }
     
     var successfullyParsed = true;

-- 
WebKit Debian packaging