Skip to content

GitLab

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

Fix css3/flexbox/line-wrap.html not to rely on a Bug 

The test says:
  All the vertical-lr cases are off by 4px in the x direction.
  See http://webkit.org/b/71193.

LayoutNG fails these tests because it doesn't have the bug.

This patch fixes expectations for LayoutNG, and add a script
for legacy to pass by adding margins to correct the
unexpected offsets.

Bug: 636993
Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_layout_ng
Change-Id: Ib8f17cae0e12d40ce511886d4ee93dff64d87b57
Reviewed-on: https://chromium-review.googlesource.com/1193865
Commit-Queue: Koji Ishii <kojii@chromium.org>
Reviewed-by: default avatarChristian Biesinger <cbiesinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#586757}
parent f67097b4
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 13 deletions
third_party/WebKit/LayoutTests/FlagExpectations/enable-blink-features=LayoutNG
View file @ 77363102
......@@ -197,7 +197,6 @@ crbug.com/591099 compositing/iframes/floating-self-painting-frame.html [ Failure
crbug.com/591099 compositing/layer-creation/overlap-animation.html [ Crash ]
crbug.com/869265 compositing/layer-creation/stacking-context-overlap-nested.html [ Failure ]
crbug.com/591099 css3/filters/composited-layer-child-bounds-after-composited-to-sw-shadow-change.html [ Failure ]
crbug.com/591099 css3/flexbox/line-wrapping.html [ Failure ]
crbug.com/714962 css3/masking/clip-path-reference-box-inline.html [ Failure ]
crbug.com/591099 editing/selection/paint-hyphen.html [ Pass ]
crbug.com/591099 external/wpt/css/CSS2/floats/floats-line-wrap-shifted-001.html [ Pass ]
......
third_party/WebKit/LayoutTests/css3/flexbox/line-wrapping.html
View file @ 77363102
......@@ -156,50 +156,48 @@ body {
</div>
</div>
<!-- FIXME: All the vertical-lr cases are off by 4px in the x direction. See http://webkit.org/b/71193. -->
<div class="flexbox fixed row vertical-lr">
<div data-expected-height data-expected-width=100>
<div data-offset-x=4></div><div data-offset-x=4></div><div data-offset-x=24 data-offset-y=0></div>
<div data-offset-x=0></div><div data-offset-x=0></div><div data-offset-x=20 data-offset-y=0></div>
</div>
<div data-expected-height=100 data-expected-width=40 style="align-self: flex-start;">
<div data-offset-x=4></div><div data-offset-x=4></div><div data-offset-x=24 data-offset-y=100></div>
<div data-offset-x=0></div><div data-offset-x=0></div><div data-offset-x=20 data-offset-y=100></div>
</div>
</div>
<div class="flexbox fixed column vertical-lr">
<div data-expected-height=200 data-expected-width=50>
<div data-offset-x=4></div><div data-offset-x=4></div><div data-offset-x=4></div><div data-offset-x=4></div><div data-offset-x=4></div><div data-offset-x=24 data-offset-y=0></div>
<div data-offset-x=0></div><div data-offset-x=0></div><div data-offset-x=0></div><div data-offset-x=0></div><div data-offset-x=0></div><div data-offset-x=20 data-offset-y=0></div>
</div>
<div data-expected-height=200 data-expected-width=50 style="align-self: flex-start;">
<div data-offset-x=54></div><div data-offset-x=54></div><div data-offset-x=54></div><div data-offset-x=54></div><div data-offset-x=54></div><div data-offset-x=74 data-offset-y=0></div>
<div data-offset-x=50></div><div data-offset-x=50></div><div data-offset-x=50></div><div data-offset-x=50></div><div data-offset-x=50></div><div data-offset-x=70 data-offset-y=0></div>
</div>
</div>
<div class="flexbox fixed column vertical-lr">
<div data-expected-height=200 data-expected-width=50>
<div data-offset-x=4></div><div data-offset-x=4></div>
<div data-offset-x=0></div><div data-offset-x=0></div>
</div>
<div data-expected-height=80 data-expected-width=50 style="align-self: flex-start;">
<div data-offset-x=54></div><div data-offset-x=54></div>
<div data-offset-x=50></div><div data-offset-x=50></div>
</div>
</div>
<div class="flexbox auto row vertical-lr" data-expected-height=500>
<div data-expected-height=250 data-expected-width=100>
<div data-offset-x=4></div><div data-offset-x=4></div><div data-offset-x=24 data-offset-y=0></div>
<div data-offset-x=0></div><div data-offset-x=0></div><div data-offset-x=20 data-offset-y=0></div>
</div>
<div data-expected-height=250 data-expected-width=40 style="align-self: flex-start;">
<div data-offset-x=4></div><div data-offset-x=4></div><div data-offset-x=24 data-offset-y=250></div>
<div data-offset-x=0></div><div data-offset-x=0></div><div data-offset-x=20 data-offset-y=250></div>
</div>
</div>
<div data-expected-height=500 data-expected-width=80 class="flexbox auto column vertical-lr">
<div data-expected-height=500 data-expected-width=40>
<div data-offset-x=4></div><div data-offset-x=4></div><div data-offset-x=4></div><div data-offset-x=4></div><div data-offset-x=4></div><div data-offset-x=24 data-offset-y=0></div>
<div data-offset-x=0></div><div data-offset-x=0></div><div data-offset-x=0></div><div data-offset-x=0></div><div data-offset-x=0></div><div data-offset-x=20 data-offset-y=0></div>
</div>
<div data-expected-height=500 data-expected-width=40 style="align-self: flex-start;">
<div data-offset-x=44></div><div data-offset-x=44></div><div data-offset-x=44></div><div data-offset-x=44></div><div data-offset-x=44></div><div data-offset-x=64 data-offset-y=0></div>
<div data-offset-x=40></div><div data-offset-x=40></div><div data-offset-x=40></div><div data-offset-x=40></div><div data-offset-x=40></div><div data-offset-x=60 data-offset-y=0></div>
</div>
</div>
......@@ -249,5 +247,16 @@ body {
</div>
</div>
<script>
// All the vertical-lr cases are off by 4px in the x direction. See http://webkit.org/b/71193.
// Fix it up if !LayoutNG.
if (window.internals && !internals.runtimeFlags.layoutNGEnabled) {
for (let div of document.querySelectorAll('.vertical-lr > div')) {
div.style.marginLeft = '-4px';
div.style.marginRight = '4px';
}
}
</script>
</body>
</html>
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