LayoutTests:

        - updated a test affected by changes to the DumpRenderTree tool
          to return a current mouse position

        * fast/inline/dirtyLinesForInline-expected.txt: Updated.

WebKitTools:

        - fix a bug in my recent change where the mouse position at the end of
          the last test would affect the results of the next test

        * DumpRenderTree/DumpRenderTree.m: (dumpRenderTree): Set lastMousePosition to 0.

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 46ce194ff5c1d35c38c7abfb038fd9a4a58a5435..c8c50658ed3a119de52e941c88fbbd59140fd502 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-01  Darin Adler  <darin@apple.com>
+
+        - updated a test affected by changes to the DumpRenderTree tool
+          to return a current mouse position
+
+        * fast/inline/dirtyLinesForInline-expected.txt: Updated.
+
 2006-07-31  Sam Weinig  <sam.weinig@gmail.com>
 
         Reviewed by Darin.

diff --git a/LayoutTests/fast/inline/dirtyLinesForInline-expected.txt b/LayoutTests/fast/inline/dirtyLinesForInline-expected.txt
index 6db12a503653f5365f1f3264855b0331c0b5ab13..c13763065ad78e98088fc646c97939291db4aef2 100644 (file)
--- a/LayoutTests/fast/inline/dirtyLinesForInline-expected.txt
+++ b/LayoutTests/fast/inline/dirtyLinesForInline-expected.txt
@@ -12,12 +12,12 @@ layer at (0,0) size 800x600
           text run at (0,0) width 598: "To reproduce this bug outside of DumpRenderTree, mouse over the links below several times. "
           text run at (598,0) width 174: "The bug is fixed if we don't"
           text run at (0,18) width 37: "crash."
-      RenderBlock {DIV} at (0,52) size 784x78
-        RenderTable {TABLE} at (0,0) size 132x78
-          RenderTableSection {TBODY} at (0,0) size 132x78
-            RenderTableRow {TR} at (0,2) size 132x74
-              RenderTableCell {TD} at (2,2) size 128x74 [r=0 c=0 rs=1 cs=1]
-                RenderBlock {DIV} at (1,1) size 126x72
+      RenderBlock {DIV} at (0,52) size 784x55
+        RenderTable {TABLE} at (0,0) size 132x55
+          RenderTableSection {TBODY} at (0,0) size 132x55
+            RenderTableRow {TR} at (0,2) size 132x51
+              RenderTableCell {TD} at (2,2) size 128x51 [r=0 c=0 rs=1 cs=1]
+                RenderBlock {DIV} at (1,1) size 126x49
                   RenderInline {A} at (0,0) size 98x36 [color=#0000EE]
                     RenderInline {SPAN} at (0,0) size 98x36
                       RenderText {#text} at (0,0) size 98x36
@@ -26,13 +26,13 @@ layer at (0,0) size 800x600
                     RenderText {#text} at (30,18) size 35x18
                       text run at (30,18) width 35: "home"
                   RenderBR {BR} at (65,32) size 0x0
-                  RenderInline {A} at (0,0) size 116x36 [color=#0000EE]
-                    RenderInline {SPAN} at (0,0) size 116x36
-                      RenderText {#text} at (0,36) size 116x36
-                        text run at (0,36) width 116: "this is the about us"
-                        text run at (0,54) width 30: "page"
-                    RenderText {#text} at (30,54) size 53x18
-                      text run at (30,54) width 53: "about us"
-                  RenderBR {BR} at (83,68) size 0x0
+                  RenderInline {A} at (0,0) size 39x13 [color=#0000EE]
+                    RenderText {#text} at (0,36) size 39x13
+                      text run at (0,36) width 39: "about us"
+                  RenderBR {BR} at (39,46) size 0x0
+layer at (11,99) size 110x13
+  RenderBlock (positioned) {SPAN} at (11,99) size 110x13
+    RenderText {#text} at (0,0) size 110x13
+      text run at (0,0) width 110: "this is the about us page"
 selection start: position 0 of child 0 {#text} of child 1 {P} of child 1 {BODY} of child 0 {HTML} of document
 selection end:   position 0 of child 1 {TABLE} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index bbf15e9c840ad4342666b8503d31f184067c96fa..2dedb950e9ca05dd6c1a110ee1d11bb1f0f43e36 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-01  Darin Adler  <darin@apple.com>
+
+        - fix a bug in my recent change where the mouse position at the end of
+          the last test would affect the results of the next test
+
+        * DumpRenderTree/DumpRenderTree.m: (dumpRenderTree): Set lastMousePosition to 0.
+
 2006-07-31  Mark Rowe  <opendarwin.org@bdash.net.nz>
 
         Reviewed by Maciej.

diff --git a/WebKitTools/DumpRenderTree/DumpRenderTree.m b/WebKitTools/DumpRenderTree/DumpRenderTree.m
index d604f6a688a8dd703fd12612368781f3c14d5c4b..40528586bf98db98f09cfc5beaae9916f32e056a 100644 (file)
--- a/WebKitTools/DumpRenderTree/DumpRenderTree.m
+++ b/WebKitTools/DumpRenderTree/DumpRenderTree.m
@@ -750,6 +750,7 @@ static void dumpRenderTree(const char *pathOrURL)
     repaintSweepHorizontally = repaintSweepHorizontallyDefault;
     if ([WebHistory optionalSharedHistory])
         [WebHistory setOptionalSharedHistory:nil];
+    lastMousePosition = NSMakePoint(0, 0);
 
     if (currentTest != nil)
         CFRelease(currentTest);