Skip to content

GitLab

T
tangled
Commit 31d4e6b7 authored by Koji Ishii's avatar Koji Ishii Committed by Commit Bot
Browse files
Options

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

This is a reland of 6ec9b32f

Mac Retina bots were down when rebaselined last time, and
they started failing when back.

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

Bug: 591099
Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_layout_ng
Change-Id: I2243c930a20a1b2404854df09fbdeec4a33c9807
Reviewed-on: https://chromium-review.googlesource.com/1149640Reviewed-by: default avatarKoji Ishii <kojii@chromium.org>
Reviewed-by: default avatarEmil A Eklund <eae@chromium.org>
Commit-Queue: Koji Ishii <kojii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577913}
parent ab7fe5e2
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 66 deletions
third_party/WebKit/LayoutTests/FlagExpectations/enable-blink-features=LayoutNG
View file @ 31d4e6b7
...@@ -723,8 +723,6 @@ crbug.com/591099 storage/indexeddb/mozilla/indexes.html [ Timeout ] ...@@ -723,8 +723,6 @@ crbug.com/591099 storage/indexeddb/mozilla/indexes.html [ Timeout ]
crbug.com/591099 storage/indexeddb/mozilla/test_objectStore_openKeyCursor.html [ Timeout ] crbug.com/591099 storage/indexeddb/mozilla/test_objectStore_openKeyCursor.html [ Timeout ]
crbug.com/591099 storage/indexeddb/objectstore-cursor.html [ Pass ] crbug.com/591099 storage/indexeddb/objectstore-cursor.html [ Pass ]
crbug.com/591099 storage/indexeddb/objectstore-keycursor.html [ Timeout ] crbug.com/591099 storage/indexeddb/objectstore-keycursor.html [ Timeout ]
crbug.com/591099 svg/as-border-image/svg-as-border-image-2.html [ Failure ]
crbug.com/591099 svg/as-border-image/svg-as-border-image.html [ Failure ]
crbug.com/591099 svg/custom/object-sizing-no-width-height.xhtml [ Failure ] crbug.com/591099 svg/custom/object-sizing-no-width-height.xhtml [ Failure ]
crbug.com/591099 svg/filters/feTurbulence-bad-seeds.html [ Failure ] crbug.com/591099 svg/filters/feTurbulence-bad-seeds.html [ Failure ]
crbug.com/591099 svg/in-html/sizing/svg-inline.html [ Failure ] crbug.com/591099 svg/in-html/sizing/svg-inline.html [ Failure ]
......
third_party/WebKit/LayoutTests/platform/linux/svg/as-border-image/svg-as-border-image-2-expected.txt
View file @ 31d4e6b7
...@@ -3,37 +3,33 @@ layer at (0,0) size 800x600 ...@@ -3,37 +3,33 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x600 layer at (0,0) size 800x600
LayoutBlockFlow {HTML} at (0,0) size 800x600 LayoutBlockFlow {HTML} at (0,0) size 800x600
LayoutBlockFlow {BODY} at (8,8) size 784x584 LayoutBlockFlow {BODY} at (8,8) size 784x584
LayoutBlockFlow {DIV} at (0,0) size 370x438.81 [border: (1px solid #000000)] LayoutBlockFlow {DIV} at (0,0) size 366x438.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 368x27 LayoutBlockFlow {H2} at (1,20.91) size 364x27
LayoutText {#text} at (0,0) size 195x26 LayoutText {#text} at (0,0) size 195x26
text run at (0,0) width 195: "SVG border-image" text run at (0,0) width 195: "SVG border-image"
LayoutBlockFlow (anonymous) at (1,67.81) size 368x370 LayoutBlockFlow (anonymous) at (1,67.81) size 364x370
LayoutBlockFlow {DIV} at (10,10) size 160x160 [border: (30px solid #000000)] LayoutBlockFlow {DIV} at (10,10) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,165) size 4x19 LayoutText {#text} at (180,165) size 4x19
text run at (180,165) width 4: " " text run at (180,165) width 4: " "
LayoutBlockFlow {DIV} at (194,10) size 160x160 [border: (30px solid #000000)] LayoutBlockFlow {DIV} at (194,10) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (364,165) size 4x19 LayoutBR {BR} at (364,180) size 0x0
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)] LayoutBlockFlow {DIV} at (10,195) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,350) size 4x19 LayoutText {#text} at (180,350) size 4x19
text run at (180,350) width 4: " " text run at (180,350) width 4: " "
LayoutBlockFlow {DIV} at (194,195) size 160x160 [border: (30px solid #000000)] LayoutBlockFlow {DIV} at (194,195) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (0,0) size 0x0 LayoutText {#text} at (0,0) size 0x0
LayoutText {#text} at (370,417) size 4x20 LayoutText {#text} at (366,417) size 4x20
text run at (370,417) width 4: " " text run at (366,417) width 4: " "
LayoutBlockFlow {DIV} at (374,0) size 370x438.81 [border: (1px solid #000000)] LayoutBlockFlow {DIV} at (370,0) size 366x438.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 368x27 LayoutBlockFlow {H2} at (1,20.91) size 364x27
LayoutText {#text} at (0,0) size 197x26 LayoutText {#text} at (0,0) size 197x26
text run at (0,0) width 197: "PNG border-image" text run at (0,0) width 197: "PNG border-image"
LayoutBlockFlow (anonymous) at (1,67.81) size 368x370 LayoutBlockFlow (anonymous) at (1,67.81) size 364x370
LayoutBlockFlow {DIV} at (10,10) size 160x160 [border: (30px solid #000000)] LayoutBlockFlow {DIV} at (10,10) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,165) size 4x19 LayoutText {#text} at (180,165) size 4x19
text run at (180,165) width 4: " " text run at (180,165) width 4: " "
LayoutBlockFlow {DIV} at (194,10) size 160x160 [border: (30px solid #000000)] LayoutBlockFlow {DIV} at (194,10) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (364,165) size 4x19 LayoutBR {BR} at (364,180) size 0x0
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)] LayoutBlockFlow {DIV} at (10,195) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,350) size 4x19 LayoutText {#text} at (180,350) size 4x19
text run at (180,350) width 4: " " 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 @ 31d4e6b7
...@@ -3,37 +3,33 @@ layer at (0,0) size 800x600 ...@@ -3,37 +3,33 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x600 layer at (0,0) size 800x600
LayoutBlockFlow {HTML} at (0,0) size 800x600 LayoutBlockFlow {HTML} at (0,0) size 800x600
LayoutBlockFlow {BODY} at (8,8) size 784x584 LayoutBlockFlow {BODY} at (8,8) size 784x584
LayoutBlockFlow {DIV} at (0,0) size 370x438.81 [border: (1px solid #000000)] LayoutBlockFlow {DIV} at (0,0) size 366x438.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 368x27 LayoutBlockFlow {H2} at (1,20.91) size 364x27
LayoutText {#text} at (0,0) size 195x26 LayoutText {#text} at (0,0) size 195x26
text run at (0,0) width 195: "SVG border-image" text run at (0,0) width 195: "SVG border-image"
LayoutBlockFlow (anonymous) at (1,67.81) size 368x370 LayoutBlockFlow (anonymous) at (1,67.81) size 364x370
LayoutBlockFlow {DIV} at (10,10) size 160x160 [border: (30px solid #000000)] LayoutBlockFlow {DIV} at (10,10) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,165) size 4x19 LayoutText {#text} at (180,165) size 4x19
text run at (180,165) width 4: " " text run at (180,165) width 4: " "
LayoutBlockFlow {DIV} at (194,10) size 160x160 [border: (30px solid #000000)] LayoutBlockFlow {DIV} at (194,10) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (364,165) size 4x19 LayoutBR {BR} at (364,180) size 0x0
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)] LayoutBlockFlow {DIV} at (10,195) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,350) size 4x19 LayoutText {#text} at (180,350) size 4x19
text run at (180,350) width 4: " " text run at (180,350) width 4: " "
LayoutBlockFlow {DIV} at (194,195) size 160x160 [border: (30px solid #000000)] LayoutBlockFlow {DIV} at (194,195) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (0,0) size 0x0 LayoutText {#text} at (0,0) size 0x0
LayoutText {#text} at (370,417) size 4x20 LayoutText {#text} at (366,417) size 4x20
text run at (370,417) width 4: " " text run at (366,417) width 4: " "
LayoutBlockFlow {DIV} at (374,0) size 370x438.81 [border: (1px solid #000000)] LayoutBlockFlow {DIV} at (370,0) size 366x438.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 368x27 LayoutBlockFlow {H2} at (1,20.91) size 364x27
LayoutText {#text} at (0,0) size 197x26 LayoutText {#text} at (0,0) size 197x26
text run at (0,0) width 197: "PNG border-image" text run at (0,0) width 197: "PNG border-image"
LayoutBlockFlow (anonymous) at (1,67.81) size 368x370 LayoutBlockFlow (anonymous) at (1,67.81) size 364x370
LayoutBlockFlow {DIV} at (10,10) size 160x160 [border: (30px solid #000000)] LayoutBlockFlow {DIV} at (10,10) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,165) size 4x19 LayoutText {#text} at (180,165) size 4x19
text run at (180,165) width 4: " " text run at (180,165) width 4: " "
LayoutBlockFlow {DIV} at (194,10) size 160x160 [border: (30px solid #000000)] LayoutBlockFlow {DIV} at (194,10) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (364,165) size 4x19 LayoutBR {BR} at (364,180) size 0x0
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)] LayoutBlockFlow {DIV} at (10,195) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,350) size 4x19 LayoutText {#text} at (180,350) size 4x19
text run at (180,350) width 4: " " 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 @ 31d4e6b7
...@@ -3,37 +3,33 @@ layer at (0,0) size 800x600 ...@@ -3,37 +3,33 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x600 layer at (0,0) size 800x600
LayoutBlockFlow {HTML} at (0,0) size 800x600 LayoutBlockFlow {HTML} at (0,0) size 800x600
LayoutBlockFlow {BODY} at (8,8) size 784x584 LayoutBlockFlow {BODY} at (8,8) size 784x584
LayoutBlockFlow {DIV} at (0,0) size 370x438.81 [border: (1px solid #000000)] LayoutBlockFlow {DIV} at (0,0) size 366x438.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 368x27 LayoutBlockFlow {H2} at (1,20.91) size 364x27
LayoutText {#text} at (0,0) size 193x26 LayoutText {#text} at (0,0) size 193x26
text run at (0,0) width 193: "SVG border-image" text run at (0,0) width 193: "SVG border-image"
LayoutBlockFlow (anonymous) at (1,67.81) size 368x370 LayoutBlockFlow (anonymous) at (1,67.81) size 364x370
LayoutBlockFlow {DIV} at (10,10) size 160x160 [border: (30px solid #000000)] LayoutBlockFlow {DIV} at (10,10) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,165) size 4x19 LayoutText {#text} at (180,165) size 4x19
text run at (180,165) width 4: " " text run at (180,165) width 4: " "
LayoutBlockFlow {DIV} at (194,10) size 160x160 [border: (30px solid #000000)] LayoutBlockFlow {DIV} at (194,10) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (364,165) size 4x19 LayoutBR {BR} at (364,180) size 0x0
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)] LayoutBlockFlow {DIV} at (10,195) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,350) size 4x19 LayoutText {#text} at (180,350) size 4x19
text run at (180,350) width 4: " " text run at (180,350) width 4: " "
LayoutBlockFlow {DIV} at (194,195) size 160x160 [border: (30px solid #000000)] LayoutBlockFlow {DIV} at (194,195) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (0,0) size 0x0 LayoutText {#text} at (0,0) size 0x0
LayoutText {#text} at (370,417) size 4x20 LayoutText {#text} at (366,417) size 4x20
text run at (370,417) width 4: " " text run at (366,417) width 4: " "
LayoutBlockFlow {DIV} at (374,0) size 370x438.81 [border: (1px solid #000000)] LayoutBlockFlow {DIV} at (370,0) size 366x438.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 368x27 LayoutBlockFlow {H2} at (1,20.91) size 364x27
LayoutText {#text} at (0,0) size 195x26 LayoutText {#text} at (0,0) size 195x26
text run at (0,0) width 195: "PNG border-image" text run at (0,0) width 195: "PNG border-image"
LayoutBlockFlow (anonymous) at (1,67.81) size 368x370 LayoutBlockFlow (anonymous) at (1,67.81) size 364x370
LayoutBlockFlow {DIV} at (10,10) size 160x160 [border: (30px solid #000000)] LayoutBlockFlow {DIV} at (10,10) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,165) size 4x19 LayoutText {#text} at (180,165) size 4x19
text run at (180,165) width 4: " " text run at (180,165) width 4: " "
LayoutBlockFlow {DIV} at (194,10) size 160x160 [border: (30px solid #000000)] LayoutBlockFlow {DIV} at (194,10) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (364,165) size 4x19 LayoutBR {BR} at (364,180) size 0x0
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)] LayoutBlockFlow {DIV} at (10,195) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,350) size 4x19 LayoutText {#text} at (180,350) size 4x19
text run at (180,350) width 4: " " 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 @ 31d4e6b7
...@@ -3,37 +3,33 @@ layer at (0,0) size 800x600 ...@@ -3,37 +3,33 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x600 layer at (0,0) size 800x600
LayoutBlockFlow {HTML} at (0,0) size 800x600 LayoutBlockFlow {HTML} at (0,0) size 800x600
LayoutBlockFlow {BODY} at (8,8) size 784x584 LayoutBlockFlow {BODY} at (8,8) size 784x584
LayoutBlockFlow {DIV} at (0,0) size 370x438.81 [border: (1px solid #000000)] LayoutBlockFlow {DIV} at (0,0) size 366x438.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 368x27 LayoutBlockFlow {H2} at (1,20.91) size 364x27
LayoutText {#text} at (0,0) size 193x26 LayoutText {#text} at (0,0) size 193x26
text run at (0,0) width 193: "SVG border-image" text run at (0,0) width 193: "SVG border-image"
LayoutBlockFlow (anonymous) at (1,67.81) size 368x370 LayoutBlockFlow (anonymous) at (1,67.81) size 364x370
LayoutBlockFlow {DIV} at (10,10) size 160x160 [border: (30px solid #000000)] LayoutBlockFlow {DIV} at (10,10) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,165) size 4x19 LayoutText {#text} at (180,165) size 4x19
text run at (180,165) width 4: " " text run at (180,165) width 4: " "
LayoutBlockFlow {DIV} at (194,10) size 160x160 [border: (30px solid #000000)] LayoutBlockFlow {DIV} at (194,10) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (364,165) size 4x19 LayoutBR {BR} at (364,180) size 0x0
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)] LayoutBlockFlow {DIV} at (10,195) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,350) size 4x19 LayoutText {#text} at (180,350) size 4x19
text run at (180,350) width 4: " " text run at (180,350) width 4: " "
LayoutBlockFlow {DIV} at (194,195) size 160x160 [border: (30px solid #000000)] LayoutBlockFlow {DIV} at (194,195) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (0,0) size 0x0 LayoutText {#text} at (0,0) size 0x0
LayoutText {#text} at (370,417) size 4x20 LayoutText {#text} at (366,417) size 4x20
text run at (370,417) width 4: " " text run at (366,417) width 4: " "
LayoutBlockFlow {DIV} at (374,0) size 370x438.81 [border: (1px solid #000000)] LayoutBlockFlow {DIV} at (370,0) size 366x438.81 [border: (1px solid #000000)]
LayoutBlockFlow {H2} at (1,20.91) size 368x27 LayoutBlockFlow {H2} at (1,20.91) size 364x27
LayoutText {#text} at (0,0) size 195x26 LayoutText {#text} at (0,0) size 195x26
text run at (0,0) width 195: "PNG border-image" text run at (0,0) width 195: "PNG border-image"
LayoutBlockFlow (anonymous) at (1,67.81) size 368x370 LayoutBlockFlow (anonymous) at (1,67.81) size 364x370
LayoutBlockFlow {DIV} at (10,10) size 160x160 [border: (30px solid #000000)] LayoutBlockFlow {DIV} at (10,10) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,165) size 4x19 LayoutText {#text} at (180,165) size 4x19
text run at (180,165) width 4: " " text run at (180,165) width 4: " "
LayoutBlockFlow {DIV} at (194,10) size 160x160 [border: (30px solid #000000)] LayoutBlockFlow {DIV} at (194,10) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (364,165) size 4x19 LayoutBR {BR} at (364,180) size 0x0
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)] LayoutBlockFlow {DIV} at (10,195) size 160x160 [border: (30px solid #000000)]
LayoutText {#text} at (180,350) size 4x19 LayoutText {#text} at (180,350) size 4x19
text run at (180,350) width 4: " " text run at (180,350) width 4: " "
......
third_party/WebKit/LayoutTests/svg/as-border-image/svg-as-border-image-2.html
View file @ 31d4e6b7
...@@ -57,8 +57,7 @@ ...@@ -57,8 +57,7 @@
<div class="svg"> <div class="svg">
<h2>SVG border-image</h2> <h2>SVG border-image</h2>
<div class="rr"></div> <div class="rr"></div>
<div class="rs"></div> <div class="rs"></div><br>
<br>
<div class="sr"></div> <div class="sr"></div>
<div class="ss"></div> <div class="ss"></div>
</div> </div>
...@@ -66,8 +65,7 @@ ...@@ -66,8 +65,7 @@
<div class="image"> <div class="image">
<h2>PNG border-image</h2> <h2>PNG border-image</h2>
<div class="rr"></div> <div class="rr"></div>
<div class="rs"></div> <div class="rs"></div><br>
<br>
<div class="sr"></div> <div class="sr"></div>
<div class="ss"></div> <div class="ss"></div>
</div> </div>
......
third_party/WebKit/LayoutTests/svg/as-border-image/svg-as-border-image.html
View file @ 31d4e6b7
...@@ -57,8 +57,7 @@ ...@@ -57,8 +57,7 @@
<div class="svg"> <div class="svg">
<h2>SVG border-image</h2> <h2>SVG border-image</h2>
<div class="rr"></div> <div class="rr"></div>
<div class="rs"></div> <div class="rs"></div><br>
<br>
<div class="sr"></div> <div class="sr"></div>
<div class="ss"></div> <div class="ss"></div>
</div> </div>
...@@ -66,8 +65,7 @@ ...@@ -66,8 +65,7 @@
<div class="image"> <div class="image">
<h2>PNG border-image</h2> <h2>PNG border-image</h2>
<div class="rr"></div> <div class="rr"></div>
<div class="rs"></div> <div class="rs"></div><br>
<br>
<div class="sr"></div> <div class="sr"></div>
<div class="ss"></div> <div class="ss"></div>
</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