git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8666812)
LayoutTests:
authorthatcher <thatcher@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Sep 2006 20:43:37 +0000 (20:43 +0000)
committerthatcher <thatcher@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Sep 2006 20:43:37 +0000 (20:43 +0000)
        Reviewed by Adam.

        Bug 10923: Frame scroll layout test failures on the buildbot
        http://bugzilla.opendarwin.org/show_bug.cgi?id=10923

        Made this test call layoutTestController.dumpChildFrameScrollPositions().

        * fast/overflow/scrollRevealButton-expected.txt:
        * fast/overflow/scrollRevealButton.html:

WebKitTools:

        Reviewed by Adam.

        Bug 10923: Frame scroll layout test failures on the buildbot
        http://bugzilla.opendarwin.org/show_bug.cgi?id=10923

        Added a new method that will toggle on the recursive dump of
        child frame scroll positions.

        * DumpRenderTree/DumpRenderTree.m:
        (dumpFrameScrollPosition):
        (+[LayoutTestController isSelectorExcludedFromWebScript:]):
        (-[LayoutTestController dumpChildFrameScrollPositions]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16503 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog patch | blob | history
LayoutTests/fast/overflow/scrollRevealButton-expected.txt patch | blob | history
LayoutTests/fast/overflow/scrollRevealButton.html patch | blob | history
WebKitTools/ChangeLog patch | blob | history
WebKitTools/DumpRenderTree/DumpRenderTree.m patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 3f90a37b0ec03f58915ba07e11bbdff8c95762fc..ce40702900b0159fdb11c294b9f3a5e1d1c27e5b 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2006-09-21  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Adam.
+
+        Bug 10923: Frame scroll layout test failures on the buildbot
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=10923
+
+        Made this test call layoutTestController.dumpChildFrameScrollPositions().
+
+        * fast/overflow/scrollRevealButton-expected.txt:
+        * fast/overflow/scrollRevealButton.html:
+
 2006-09-20  Justin Garcia  <justin.garcia@apple.com>
 
         Reviewed by john
diff --git a/LayoutTests/fast/overflow/scrollRevealButton-expected.txt b/LayoutTests/fast/overflow/scrollRevealButton-expected.txt
index 868ad610453af1da26563657dddd2cb05b166b67..9708def0269261d3418c1816959ddcc01d91d46d 100644 (file)
--- a/LayoutTests/fast/overflow/scrollRevealButton-expected.txt
+++ b/LayoutTests/fast/overflow/scrollRevealButton-expected.txt
@@ -7,6 +7,7 @@ layer at (0,0) size 785x1184
         RenderText {#text} at (0,0) size 339x18
           text run at (0,0) width 339: "This test should scroll recursively to reveal the button."
         RenderText {#text} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 0x0
       RenderBlock {DIV} at (0,18) size 769x500
       RenderBlock (anonymous) at (0,518) size 769x150
         RenderPartObject {IFRAME} at (0,0) size 300x150
diff --git a/LayoutTests/fast/overflow/scrollRevealButton.html b/LayoutTests/fast/overflow/scrollRevealButton.html
index 98c4744edfea83332d5470070d7dc2bd75a05a31..a7dfc890c990c887e76e4fddcba757b2fe0368c5 100644 (file)
--- a/LayoutTests/fast/overflow/scrollRevealButton.html
+++ b/LayoutTests/fast/overflow/scrollRevealButton.html
@@ -1,5 +1,6 @@
 <html>This test should scroll recursively to reveal the button.
 <body onload="document.getElementById('fr').contentDocument.getElementById('bt').focus();">
+<script>if(layoutTestController) layoutTestController.dumpChildFrameScrollPositions();</script>
 <div style="height:500px"></div>
 <iframe src="resources/scrollButton1.html" id="fr"></iframe>
 <div style="height:500px"></div>
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 7d967fa6807340173ad8f0b2d92a44e46a154b1f..a8514e9e22519120840896630860f4a26ba466d0 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2006-09-21  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Adam.
+
+        Bug 10923: Frame scroll layout test failures on the buildbot
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=10923
+        
+        Added a new method that will toggle on the recursive dump of
+        child frame scroll positions.
+ 
+        * DumpRenderTree/DumpRenderTree.m:
+        (dumpFrameScrollPosition):
+        (+[LayoutTestController isSelectorExcludedFromWebScript:]):
+        (-[LayoutTestController dumpChildFrameScrollPositions]):
+
 2006-09-19  Krzysztof Kowalczyk <kkowalczyk@gmail.com>
 
         Reviewed by eseidel.  Landed by eseidel.
diff --git a/WebKitTools/DumpRenderTree/DumpRenderTree.m b/WebKitTools/DumpRenderTree/DumpRenderTree.m
index cf93d206c6c54419c8d57aa81a4aaea8149ee192..d4e1cc7e81299b527cc81062423c7e3bfd0809e9 100644 (file)
--- a/WebKitTools/DumpRenderTree/DumpRenderTree.m
+++ b/WebKitTools/DumpRenderTree/DumpRenderTree.m
@@ -105,6 +105,7 @@ static BOOL dumpAsText;
 static BOOL dumpSelectionRect;
 static BOOL dumpTitleChanges;
 static BOOL dumpBackForwardList;
+static BOOL dumpChildFrameScrollPositions;
 static int dumpPixels = NO;
 static int dumpAllPixels = NO;
 static BOOL readFromWindow = NO;
@@ -426,10 +427,13 @@ static void dumpFrameScrollPosition(WebFrame *f)
             printf("frame '%s' ", [[f name] UTF8String]);
         printf("scrolled to %.f,%.f\n", scrollPosition.x, scrollPosition.y);
     }
-    NSArray *kids = [f childFrames];
-    if (kids)
-        for (unsigned i = 0; i < [kids count]; i++)
-            dumpFrameScrollPosition([kids objectAtIndex:i]);
+
+    if (dumpChildFrameScrollPositions) {
+        NSArray *kids = [f childFrames];
+        if (kids)
+            for (unsigned i = 0; i < [kids count]; i++)
+                dumpFrameScrollPosition([kids objectAtIndex:i]);
+    }
 }
 
 static void dump(void)
@@ -722,6 +726,7 @@ static void dump(void)
             || aSelector == @selector(dumpAsText)
             || aSelector == @selector(dumpTitleChanges)
             || aSelector == @selector(dumpBackForwardList)
+            || aSelector == @selector(dumpChildFrameScrollPositions)
             || aSelector == @selector(setWindowIsKey:)
             || aSelector == @selector(setMainFrameIsFirstResponder:)
             || aSelector == @selector(dumpSelectionRect)
@@ -815,6 +820,11 @@ static void dump(void)
     dumpBackForwardList = YES;
 }
 
+- (void)dumpChildFrameScrollPositions
+{
+    dumpChildFrameScrollPositions = YES;
+}
+
 - (void)setWindowIsKey:(BOOL)flag
 {
     windowIsKey = flag;
Mirror of the WebKit open source project from svn.webkit.org.