fast/block/float/015.html uses wrong urls for resources

https://bugs.webkit.org/show_bug.cgi?id=264938 Reviewed by Alan Baradlay. Merge: https://chromium.googlesource.com/chromium/blink/+/3638adff97a04d3a6aff5d55ff88564ee181c392 This PR is to fix 'resources' urls used in the test case and update test expectations accordingly. * LayoutTests/fast/block/float/015.html: Updated * LayoutTests/fast/block/float/resources/base.css: Add Test Resource * LayoutTests/fast/block/float/resources/vblank.gif: Ditto * LayoutTests/platform/mac/fast/block/float/015-expected.txt: Rebaselined * LayoutTests/platform/glib/fast/block/float/015-expected.txt: Rebaselined * LayoutTests/platform/gtk/fast/block/float/015-expected.png: Rebaselined * LayoutTests/platform/ios/fast/block/float/015-expected.txt: Rebaselined Canonical link: https://commits.webkit.org/270957@main
WebKit · Nov 20, 2023 · 0cc83e2 · 0cc83e2
1 parent 0465e17
commit 0cc83e2
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 21 deletions.
diff --git a/LayoutTests/fast/block/float/015.html b/LayoutTests/fast/block/float/015.html
@@ -5,7 +5,7 @@
 <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <META http-equiv="Content-Style-Type" content="text/css">
 
-<LINK rel="stylesheet" type="text/css" media="screen" href="../resources/base.css">
+<LINK rel="stylesheet" type="text/css" media="screen" href="resources/base.css">
 <STYLE type="text/css">
 .one {clear: left;}
 .two {clear: right;}
@@ -17,12 +17,12 @@
 <BODY><TABLE border cellspacing="0" cellpadding="3" class="tabletest">
 <TR>
 <TD bgcolor="silver">&nbsp;</TD>
-<TD><IMG SRC="../resources/vblank.gif" height="50" align="left" alt="[Image]">
+<TD><IMG SRC="resources/vblank.gif" height="50" align="left" alt="[Image]">
 <p >
 This text should be flowing past a tall orange rectangle on the left side of the browser window.
 </p>
 <div style="background-color:green"><BR clear="all"></div>
-<IMG SRC="../resources/vblank.gif" height="50" align="left" alt="[Image]">
+<IMG SRC="resources/vblank.gif" height="50" align="left" alt="[Image]">
  <div class="one">
 This paragraph should appear below the tall orange rectangle above and to the left, and not flow past it. 
 </div>

diff --git a/LayoutTests/fast/block/float/resources/base.css b/LayoutTests/fast/block/float/resources/base.css
@@ -0,0 +1,3 @@
+BODY {color: black; background: #CCCCCC url(basebg.gif);}
+A:link {color: blue;}
+A:visited {color: #006600;}
diff --git a/LayoutTests/fast/block/float/resources/vblank.gif b/LayoutTests/fast/block/float/resources/vblank.gif
diff --git a/LayoutTests/platform/glib/fast/block/float/015-expected.txt b/LayoutTests/platform/glib/fast/block/float/015-expected.txt
@@ -2,21 +2,21 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
+    RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC]
       RenderTable {TABLE} at (0,0) size 671x130 [border: (1px outset #808080)]
         RenderTableSection {TBODY} at (1,1) size 669x128
           RenderTableRow {TR} at (0,0) size 669x128
             RenderTableCell {TD} at (0,51) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 4x17
                 text run at (4,4) width 4: " "
             RenderTableCell {TD} at (12,0) size 657x128 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
-              RenderImage {IMG} at (4,4) size 50x50 [bgcolor=#FFA500]
+              RenderImage {IMG} at (4,4) size 15x50 [bgcolor=#FFA500]
               RenderBlock {P} at (4,4) size 649x18
-                RenderText {#text} at (53,0) size 594x17
-                  text run at (53,0) width 594: "This text should be flowing past a tall orange rectangle on the left side of the browser window."
+                RenderText {#text} at (18,0) size 594x17
+                  text run at (18,0) width 594: "This text should be flowing past a tall orange rectangle on the left side of the browser window."
               RenderBlock {DIV} at (4,38) size 649x18 [bgcolor=#008000]
-                RenderBR {BR} at (53,0) size 0x17
-              RenderImage {IMG} at (4,56) size 50x50 [bgcolor=#FFA500]
+                RenderBR {BR} at (18,0) size 0x17
+              RenderImage {IMG} at (4,56) size 15x50 [bgcolor=#FFA500]
               RenderBlock {DIV} at (4,106) size 649x18
                 RenderText {#text} at (0,0) size 649x17
                   text run at (0,0) width 649: "This paragraph should appear below the tall orange rectangle above and to the left, and not flow past it."
diff --git a/LayoutTests/platform/gtk/fast/block/float/015-expected.png b/LayoutTests/platform/gtk/fast/block/float/015-expected.png
diff --git a/LayoutTests/platform/ios/fast/block/float/015-expected.txt b/LayoutTests/platform/ios/fast/block/float/015-expected.txt
@@ -2,21 +2,21 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
+    RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC]
       RenderTable {TABLE} at (0,0) size 684x136 [border: (1px outset #808080)]
         RenderTableSection {TBODY} at (1,1) size 682x134
           RenderTableRow {TR} at (0,0) size 682x134
             RenderTableCell {TD} at (0,53) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 4x19
                 text run at (4,4) width 4: " "
             RenderTableCell {TD} at (12,0) size 670x134 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
-              RenderImage {IMG} at (4,4) size 50x50 [bgcolor=#FFA500]
+              RenderImage {IMG} at (4,4) size 15x50 [bgcolor=#FFA500]
               RenderBlock {P} at (4,4) size 662x20
-                RenderText {#text} at (53,0) size 606x19
-                  text run at (53,0) width 606: "This text should be flowing past a tall orange rectangle on the left side of the browser window."
+                RenderText {#text} at (18,0) size 606x19
+                  text run at (18,0) width 606: "This text should be flowing past a tall orange rectangle on the left side of the browser window."
               RenderBlock {DIV} at (4,40) size 662x20 [bgcolor=#008000]
-                RenderBR {BR} at (53,0) size 0x19
-              RenderImage {IMG} at (4,60) size 50x50 [bgcolor=#FFA500]
+                RenderBR {BR} at (18,0) size 0x19
+              RenderImage {IMG} at (4,60) size 15x50 [bgcolor=#FFA500]
               RenderBlock {DIV} at (4,110) size 662x20
                 RenderText {#text} at (0,0) size 662x19
                   text run at (0,0) width 662: "This paragraph should appear below the tall orange rectangle above and to the left, and not flow past it."
diff --git a/LayoutTests/platform/mac/fast/block/float/015-expected.txt b/LayoutTests/platform/mac/fast/block/float/015-expected.txt
@@ -2,21 +2,21 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
+    RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC]
       RenderTable {TABLE} at (0,0) size 683x130 [border: (1px outset #808080)]
         RenderTableSection {TBODY} at (1,1) size 681x128
           RenderTableRow {TR} at (0,0) size 681x128
             RenderTableCell {TD} at (0,51) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (4,4) size 4x18
                 text run at (4,4) width 4: " "
             RenderTableCell {TD} at (12,0) size 669x128 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
-              RenderImage {IMG} at (4,4) size 50x50 [bgcolor=#FFA500]
+              RenderImage {IMG} at (4,4) size 15x50 [bgcolor=#FFA500]
               RenderBlock {P} at (4,4) size 661x18
-                RenderText {#text} at (53,0) size 605x18
-                  text run at (53,0) width 605: "This text should be flowing past a tall orange rectangle on the left side of the browser window."
+                RenderText {#text} at (18,0) size 605x18
+                  text run at (18,0) width 605: "This text should be flowing past a tall orange rectangle on the left side of the browser window."
               RenderBlock {DIV} at (4,38) size 661x18 [bgcolor=#008000]
-                RenderBR {BR} at (53,0) size 0x18
-              RenderImage {IMG} at (4,56) size 50x50 [bgcolor=#FFA500]
+                RenderBR {BR} at (18,0) size 0x18
+              RenderImage {IMG} at (4,56) size 15x50 [bgcolor=#FFA500]
               RenderBlock {DIV} at (4,106) size 661x18
                 RenderText {#text} at (0,0) size 661x18
                   text run at (0,0) width 661: "This paragraph should appear below the tall orange rectangle above and to the left, and not flow past it."