Commit 12d221c6 authored by Morten Stenshorne's avatar Morten Stenshorne Committed by Commit Bot

[LayoutNG] Fix and re-enable 3 float fragmentation unit tests.

Float fragmentation currently doesn't work if the float is "inside" a
line. But three existing (but disabled) tests actually had no lines, so
they already behaved correctly. The expectation, however, was that we
created a dummy line beside the floats (which we did, back in the days),
but this is no longer the case, so I just removed that.

Bug: 915929
Change-Id: I6b5d04c044860d1225b155fc9c7e70512602b398
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1913254Reviewed-by: default avatarIan Kilpatrick <ikilpatrick@chromium.org>
Commit-Queue: Morten Stenshorne <mstensho@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715023}
parent cd522ee0
......@@ -562,8 +562,7 @@ TEST_F(NGColumnLayoutAlgorithmTest, UnusedSpaceInBlock) {
EXPECT_EQ(expectation, dump);
}
// TODO(crbug.com/915929): Fix inline-level float fragmentation.
TEST_F(NGColumnLayoutAlgorithmTest, DISABLED_FloatInOneColumn) {
TEST_F(NGColumnLayoutAlgorithmTest, FloatInOneColumn) {
SetBodyInnerHTML(R"HTML(
<style>
#parent {
......@@ -587,13 +586,11 @@ TEST_F(NGColumnLayoutAlgorithmTest, DISABLED_FloatInOneColumn) {
offset:0,0 size:320x100
offset:0,0 size:100x100
offset:0,0 size:75x100
offset:75,0 size:0x0
)DUMP";
EXPECT_EQ(expectation, dump);
}
// TODO(crbug.com/915929): Fix inline-level float fragmentation.
TEST_F(NGColumnLayoutAlgorithmTest, DISABLED_TwoFloatsInOneColumn) {
TEST_F(NGColumnLayoutAlgorithmTest, TwoFloatsInOneColumn) {
SetBodyInnerHTML(R"HTML(
<style>
#parent {
......@@ -619,13 +616,11 @@ TEST_F(NGColumnLayoutAlgorithmTest, DISABLED_TwoFloatsInOneColumn) {
offset:0,0 size:100x100
offset:0,0 size:15x100
offset:84,0 size:16x100
offset:15,0 size:0x0
)DUMP";
EXPECT_EQ(expectation, dump);
}
// TODO(crbug.com/915929): Fix inline-level float fragmentation.
TEST_F(NGColumnLayoutAlgorithmTest, DISABLED_TwoFloatsInTwoColumns) {
TEST_F(NGColumnLayoutAlgorithmTest, TwoFloatsInTwoColumns) {
SetBodyInnerHTML(R"HTML(
<style>
#parent {
......@@ -651,7 +646,6 @@ TEST_F(NGColumnLayoutAlgorithmTest, DISABLED_TwoFloatsInTwoColumns) {
offset:0,0 size:100x100
offset:0,0 size:15x100
offset:84,0 size:16x100
offset:15,0 size:0x0
offset:110,0 size:100x50
offset:0,0 size:15x50
offset:84,0 size:16x50
......
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