Skip to content

GitLab

T
tangled
Commit 17a927eb authored by Derek Cheng's avatar Derek Cheng Committed by Commit Bot
Browse files
Options

Revert "[LayoutNG] Remove spaces before <br> to avoid crbug.com/40634" 

This reverts commit 6ec9b32f.

Reason for revert: <INSERT REASONING HERE>

svg/as-border-image/svg-as-border-image.html / svg/as-border-image/svg-as-border-image-2.html have been failing since https://ci.chromium.org/buildbot/chromium.webkit/WebKit%20Mac10.13%20%28retina%29/65
Original change's description:
> [LayoutNG] Remove spaces before <br> to avoid crbug.com/40634
> 
> This patch removes spaces before <br> because the images do
> not match due to crbug.com/40634, which LayoutNG does not
> have the problem.
> 
> TBR=eae@chromium.org
> 
> Bug: 591099
> Change-Id: I8f0770f8911ce2d5c6f9e37ff90752011b84cb49
> Reviewed-on: https://chromium-review.googlesource.com/1142050
> Reviewed-by: Koji Ishii <kojii@chromium.org>
> Commit-Queue: Koji Ishii <kojii@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#576333}

TBR=eae@chromium.org,kojii@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 591099
Change-Id: Iaeae508ed67354b06beec60704fdb0da5021bd34
Reviewed-on: https://chromium-review.googlesource.com/1148807Reviewed-by: default avatarDerek Cheng <imcheng@chromium.org>
Commit-Queue: Derek Cheng <imcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577652}
parent 5282390e
Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 64 deletions
third_party/WebKit/LayoutTests/platform/linux/svg/as-border-image/svg-as-border-image-2-expected.txt
View file @ 17a927eb
......@@ -3,33 +3,37 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x600
LayoutBlockFlow {HTML} at (0,0) size 800x600
LayoutBlockFlow {BODY} at (8,8) size 784x584
LayoutBlockFlow {DIV} at (0,0) size 366x438.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 364x27
LayoutBlockFlow {DIV} at (0,0) size 370x438.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 368x27
LayoutText {#text} at (0,0) size 195x26
text run at (0,0) width 195: "SVG border-image"
LayoutBlockFlow (anonymous) at (1,67.81) size 364x370
LayoutBlockFlow (anonymous) at (1,67.81) size 368x370
LayoutBlockFlow {DIV} at (10,10) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,165) size 4x19
text run at (180,165) width 4: " "
LayoutBlockFlow {DIV} at (194,10) size 160x160 [border: (30px solid #000000)]
LayoutBR {BR} at (364,180) size 0x0
LayoutText {#text} at (364,165) size 4x19
text run at (364,165) width 4: " "
LayoutBR {BR} at (0,0) size 0x0
LayoutBlockFlow {DIV} at (10,195) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,350) size 4x19
text run at (180,350) width 4: " "
LayoutBlockFlow {DIV} at (194,195) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (0,0) size 0x0
LayoutText {#text} at (366,417) size 4x20
text run at (366,417) width 4: " "
LayoutBlockFlow {DIV} at (370,0) size 366x438.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 364x27
LayoutText {#text} at (370,417) size 4x20
text run at (370,417) width 4: " "
LayoutBlockFlow {DIV} at (374,0) size 370x438.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 368x27
LayoutText {#text} at (0,0) size 197x26
text run at (0,0) width 197: "PNG border-image"
LayoutBlockFlow (anonymous) at (1,67.81) size 364x370
LayoutBlockFlow (anonymous) at (1,67.81) size 368x370
LayoutBlockFlow {DIV} at (10,10) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,165) size 4x19
text run at (180,165) width 4: " "
LayoutBlockFlow {DIV} at (194,10) size 160x160 [border: (30px solid #000000)]
LayoutBR {BR} at (364,180) size 0x0
LayoutText {#text} at (364,165) size 4x19
text run at (364,165) width 4: " "
LayoutBR {BR} at (0,0) size 0x0
LayoutBlockFlow {DIV} at (10,195) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,350) size 4x19
text run at (180,350) width 4: " "
......
third_party/WebKit/LayoutTests/platform/linux/svg/as-border-image/svg-as-border-image-expected.txt
View file @ 17a927eb
......@@ -3,33 +3,37 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x600
LayoutBlockFlow {HTML} at (0,0) size 800x600
LayoutBlockFlow {BODY} at (8,8) size 784x584
LayoutBlockFlow {DIV} at (0,0) size 366x438.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 364x27
LayoutBlockFlow {DIV} at (0,0) size 370x438.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 368x27
LayoutText {#text} at (0,0) size 195x26
text run at (0,0) width 195: "SVG border-image"
LayoutBlockFlow (anonymous) at (1,67.81) size 364x370
LayoutBlockFlow (anonymous) at (1,67.81) size 368x370
LayoutBlockFlow {DIV} at (10,10) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,165) size 4x19
text run at (180,165) width 4: " "
LayoutBlockFlow {DIV} at (194,10) size 160x160 [border: (30px solid #000000)]
LayoutBR {BR} at (364,180) size 0x0
LayoutText {#text} at (364,165) size 4x19
text run at (364,165) width 4: " "
LayoutBR {BR} at (0,0) size 0x0
LayoutBlockFlow {DIV} at (10,195) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,350) size 4x19
text run at (180,350) width 4: " "
LayoutBlockFlow {DIV} at (194,195) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (0,0) size 0x0
LayoutText {#text} at (366,417) size 4x20
text run at (366,417) width 4: " "
LayoutBlockFlow {DIV} at (370,0) size 366x438.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 364x27
LayoutText {#text} at (370,417) size 4x20
text run at (370,417) width 4: " "
LayoutBlockFlow {DIV} at (374,0) size 370x438.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 368x27
LayoutText {#text} at (0,0) size 197x26
text run at (0,0) width 197: "PNG border-image"
LayoutBlockFlow (anonymous) at (1,67.81) size 364x370
LayoutBlockFlow (anonymous) at (1,67.81) size 368x370
LayoutBlockFlow {DIV} at (10,10) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,165) size 4x19
text run at (180,165) width 4: " "
LayoutBlockFlow {DIV} at (194,10) size 160x160 [border: (30px solid #000000)]
LayoutBR {BR} at (364,180) size 0x0
LayoutText {#text} at (364,165) size 4x19
text run at (364,165) width 4: " "
LayoutBR {BR} at (0,0) size 0x0
LayoutBlockFlow {DIV} at (10,195) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,350) size 4x19
text run at (180,350) width 4: " "
......
third_party/WebKit/LayoutTests/platform/mac/svg/as-border-image/svg-as-border-image-2-expected.txt
View file @ 17a927eb
......@@ -3,33 +3,37 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x600
LayoutBlockFlow {HTML} at (0,0) size 800x600
LayoutBlockFlow {BODY} at (8,8) size 784x584
LayoutBlockFlow {DIV} at (0,0) size 366x437.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 364x28
LayoutBlockFlow {DIV} at (0,0) size 370x437.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 368x28
LayoutText {#text} at (0,0) size 195x28
text run at (0,0) width 195: "SVG border-image"
LayoutBlockFlow (anonymous) at (1,68.81) size 364x368
LayoutBlockFlow (anonymous) at (1,68.81) size 368x368
LayoutBlockFlow {DIV} at (10,10) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,166) size 4x18
text run at (180,166) width 4: " "
LayoutBlockFlow {DIV} at (194,10) size 160x160 [border: (30px solid #000000)]
LayoutBR {BR} at (364,180) size 0x0
LayoutText {#text} at (364,166) size 4x18
text run at (364,166) width 4: " "
LayoutBR {BR} at (0,0) size 0x0
LayoutBlockFlow {DIV} at (10,194) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,350) size 4x18
text run at (180,350) width 4: " "
LayoutBlockFlow {DIV} at (194,194) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (0,0) size 0x0
LayoutText {#text} at (366,418) size 4x19
text run at (366,418) width 4: " "
LayoutBlockFlow {DIV} at (370,0) size 366x437.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 364x28
LayoutText {#text} at (370,418) size 4x19
text run at (370,418) width 4: " "
LayoutBlockFlow {DIV} at (374,0) size 370x437.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 368x28
LayoutText {#text} at (0,0) size 196x28
text run at (0,0) width 196: "PNG border-image"
LayoutBlockFlow (anonymous) at (1,68.81) size 364x368
LayoutBlockFlow (anonymous) at (1,68.81) size 368x368
LayoutBlockFlow {DIV} at (10,10) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,166) size 4x18
text run at (180,166) width 4: " "
LayoutBlockFlow {DIV} at (194,10) size 160x160 [border: (30px solid #000000)]
LayoutBR {BR} at (364,180) size 0x0
LayoutText {#text} at (364,166) size 4x18
text run at (364,166) width 4: " "
LayoutBR {BR} at (0,0) size 0x0
LayoutBlockFlow {DIV} at (10,194) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,350) size 4x18
text run at (180,350) width 4: " "
......
third_party/WebKit/LayoutTests/platform/mac/svg/as-border-image/svg-as-border-image-expected.txt
View file @ 17a927eb
......@@ -3,33 +3,37 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x600
LayoutBlockFlow {HTML} at (0,0) size 800x600
LayoutBlockFlow {BODY} at (8,8) size 784x584
LayoutBlockFlow {DIV} at (0,0) size 366x437.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 364x28
LayoutBlockFlow {DIV} at (0,0) size 370x437.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 368x28
LayoutText {#text} at (0,0) size 195x28
text run at (0,0) width 195: "SVG border-image"
LayoutBlockFlow (anonymous) at (1,68.81) size 364x368
LayoutBlockFlow (anonymous) at (1,68.81) size 368x368
LayoutBlockFlow {DIV} at (10,10) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,166) size 4x18
text run at (180,166) width 4: " "
LayoutBlockFlow {DIV} at (194,10) size 160x160 [border: (30px solid #000000)]
LayoutBR {BR} at (364,180) size 0x0
LayoutText {#text} at (364,166) size 4x18
text run at (364,166) width 4: " "
LayoutBR {BR} at (0,0) size 0x0
LayoutBlockFlow {DIV} at (10,194) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,350) size 4x18
text run at (180,350) width 4: " "
LayoutBlockFlow {DIV} at (194,194) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (0,0) size 0x0
LayoutText {#text} at (366,418) size 4x19
text run at (366,418) width 4: " "
LayoutBlockFlow {DIV} at (370,0) size 366x437.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 364x28
LayoutText {#text} at (370,418) size 4x19
text run at (370,418) width 4: " "
LayoutBlockFlow {DIV} at (374,0) size 370x437.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 368x28
LayoutText {#text} at (0,0) size 196x28
text run at (0,0) width 196: "PNG border-image"
LayoutBlockFlow (anonymous) at (1,68.81) size 364x368
LayoutBlockFlow (anonymous) at (1,68.81) size 368x368
LayoutBlockFlow {DIV} at (10,10) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,166) size 4x18
text run at (180,166) width 4: " "
LayoutBlockFlow {DIV} at (194,10) size 160x160 [border: (30px solid #000000)]
LayoutBR {BR} at (364,180) size 0x0
LayoutText {#text} at (364,166) size 4x18
text run at (364,166) width 4: " "
LayoutBR {BR} at (0,0) size 0x0
LayoutBlockFlow {DIV} at (10,194) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,350) size 4x18
text run at (180,350) width 4: " "
......
third_party/WebKit/LayoutTests/platform/win/svg/as-border-image/svg-as-border-image-2-expected.txt
View file @ 17a927eb
......@@ -3,33 +3,37 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x600
LayoutBlockFlow {HTML} at (0,0) size 800x600
LayoutBlockFlow {BODY} at (8,8) size 784x584
LayoutBlockFlow {DIV} at (0,0) size 366x438.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 364x27
LayoutBlockFlow {DIV} at (0,0) size 370x438.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 368x27
LayoutText {#text} at (0,0) size 193x26
text run at (0,0) width 193: "SVG border-image"
LayoutBlockFlow (anonymous) at (1,67.81) size 364x370
LayoutBlockFlow (anonymous) at (1,67.81) size 368x370
LayoutBlockFlow {DIV} at (10,10) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,165) size 4x19
text run at (180,165) width 4: " "
LayoutBlockFlow {DIV} at (194,10) size 160x160 [border: (30px solid #000000)]
LayoutBR {BR} at (364,180) size 0x0
LayoutText {#text} at (364,165) size 4x19
text run at (364,165) width 4: " "
LayoutBR {BR} at (0,0) size 0x0
LayoutBlockFlow {DIV} at (10,195) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,350) size 4x19
text run at (180,350) width 4: " "
LayoutBlockFlow {DIV} at (194,195) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (0,0) size 0x0
LayoutText {#text} at (366,417) size 4x20
text run at (366,417) width 4: " "
LayoutBlockFlow {DIV} at (370,0) size 366x438.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 364x27
LayoutText {#text} at (370,417) size 4x20
text run at (370,417) width 4: " "
LayoutBlockFlow {DIV} at (374,0) size 370x438.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 368x27
LayoutText {#text} at (0,0) size 195x26
text run at (0,0) width 195: "PNG border-image"
LayoutBlockFlow (anonymous) at (1,67.81) size 364x370
LayoutBlockFlow (anonymous) at (1,67.81) size 368x370
LayoutBlockFlow {DIV} at (10,10) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,165) size 4x19
text run at (180,165) width 4: " "
LayoutBlockFlow {DIV} at (194,10) size 160x160 [border: (30px solid #000000)]
LayoutBR {BR} at (364,180) size 0x0
LayoutText {#text} at (364,165) size 4x19
text run at (364,165) width 4: " "
LayoutBR {BR} at (0,0) size 0x0
LayoutBlockFlow {DIV} at (10,195) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,350) size 4x19
text run at (180,350) width 4: " "
......
third_party/WebKit/LayoutTests/platform/win/svg/as-border-image/svg-as-border-image-expected.txt
View file @ 17a927eb
......@@ -3,33 +3,37 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x600
LayoutBlockFlow {HTML} at (0,0) size 800x600
LayoutBlockFlow {BODY} at (8,8) size 784x584
LayoutBlockFlow {DIV} at (0,0) size 366x438.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 364x27
LayoutBlockFlow {DIV} at (0,0) size 370x438.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 368x27
LayoutText {#text} at (0,0) size 193x26
text run at (0,0) width 193: "SVG border-image"
LayoutBlockFlow (anonymous) at (1,67.81) size 364x370
LayoutBlockFlow (anonymous) at (1,67.81) size 368x370
LayoutBlockFlow {DIV} at (10,10) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,165) size 4x19
text run at (180,165) width 4: " "
LayoutBlockFlow {DIV} at (194,10) size 160x160 [border: (30px solid #000000)]
LayoutBR {BR} at (364,180) size 0x0
LayoutText {#text} at (364,165) size 4x19
text run at (364,165) width 4: " "
LayoutBR {BR} at (0,0) size 0x0
LayoutBlockFlow {DIV} at (10,195) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,350) size 4x19
text run at (180,350) width 4: " "
LayoutBlockFlow {DIV} at (194,195) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (0,0) size 0x0
LayoutText {#text} at (366,417) size 4x20
text run at (366,417) width 4: " "
LayoutBlockFlow {DIV} at (370,0) size 366x438.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 364x27
LayoutText {#text} at (370,417) size 4x20
text run at (370,417) width 4: " "
LayoutBlockFlow {DIV} at (374,0) size 370x438.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 368x27
LayoutText {#text} at (0,0) size 195x26
text run at (0,0) width 195: "PNG border-image"
LayoutBlockFlow (anonymous) at (1,67.81) size 364x370
LayoutBlockFlow (anonymous) at (1,67.81) size 368x370
LayoutBlockFlow {DIV} at (10,10) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,165) size 4x19
text run at (180,165) width 4: " "
LayoutBlockFlow {DIV} at (194,10) size 160x160 [border: (30px solid #000000)]
LayoutBR {BR} at (364,180) size 0x0
LayoutText {#text} at (364,165) size 4x19
text run at (364,165) width 4: " "
LayoutBR {BR} at (0,0) size 0x0
LayoutBlockFlow {DIV} at (10,195) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,350) size 4x19
text run at (180,350) width 4: " "
......
third_party/WebKit/LayoutTests/svg/as-border-image/svg-as-border-image-2.html
View file @ 17a927eb
......@@ -57,7 +57,8 @@
<div class="svg">
<h2>SVG border-image</h2>
<div class="rr"></div>
<div class="rs"></div><br>
<div class="rs"></div>
<br>
<div class="sr"></div>
<div class="ss"></div>
</div>
......@@ -65,7 +66,8 @@
<div class="image">
<h2>PNG border-image</h2>
<div class="rr"></div>
<div class="rs"></div><br>
<div class="rs"></div>
<br>
<div class="sr"></div>
<div class="ss"></div>
</div>
......
third_party/WebKit/LayoutTests/svg/as-border-image/svg-as-border-image.html
View file @ 17a927eb
......@@ -57,7 +57,8 @@
<div class="svg">
<h2>SVG border-image</h2>
<div class="rr"></div>
<div class="rs"></div><br>
<div class="rs"></div>
<br>
<div class="sr"></div>
<div class="ss"></div>
</div>
......@@ -65,7 +66,8 @@
<div class="image">
<h2>PNG border-image</h2>
<div class="rr"></div>
<div class="rs"></div><br>
<div class="rs"></div>
<br>
<div class="sr"></div>
<div class="ss"></div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment