Bug 1681050 - Fix a few test issues that were exposed with fragmentation fallback enabled. r=emilio

Differential Revision: https://phabricator.services.mozilla.com/D98942
This commit is contained in:
Mats Palmgren 2020-12-08 14:53:45 +00:00
Родитель 359588f7b6
Коммит 09aea8a939
18 изменённых файлов: 74 добавлений и 52 удалений

Просмотреть файл

@ -9,7 +9,8 @@ fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azur
== table-caption-2.html table-internal-2-ref.html
== table-caption-3.html table-internal-3-ref.html
== table-caption-4.html table-internal-8-ref.html
!= table-caption-5.html table-print-1-ref.html # TODO: change to == when bug 967870 is fixed
pref(layout.display-list.improve-fragmentation,false) != table-caption-5.html table-print-1-ref.html # TODO: change to == and remove pref when bug 967870 is fixed
pref(layout.display-list.improve-fragmentation,true) == table-caption-5.html table-print-1-ref.html # TODO: remove when bug 967870 is fixed
== table-cell-1.html table-internal-1-ref.html
== table-cell-2.html table-internal-2-ref.html
== table-cell-3.html table-internal-3-ref.html
@ -17,7 +18,8 @@ fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azur
== table-cell-5.html table-internal-5-ref.html
== table-cell-6.html table-internal-6-ref.html
== table-cell-7.html table-internal-7-ref.html
!= table-cell-8.html table-print-1-ref.html # TODO: change to == when bug 967870 is fixed
pref(layout.display-list.improve-fragmentation,false) != table-cell-8.html table-print-1-ref.html # TODO: change to == and remove pref when bug 967870 is fixed
pref(layout.display-list.improve-fragmentation,true) == table-cell-8.html table-print-1-ref.html # TODO: remove when bug 967870 is fixed
== table-row-1.html table-internal-1-ref.html
== table-row-2.html table-internal-2-ref.html
== table-row-3.html table-internal-3-ref.html

Просмотреть файл

@ -1,6 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" class="reftest-paged"><head>
<style>
@page { size:5in 3in; margin:0.5in; }
div.spacer {
height: 5px;
width: 10px;

Просмотреть файл

@ -1,6 +1,8 @@
<!DOCTYPE HTML>
<html class="reftest-paged">
<title>Test for setting and handling of mIsTopOfPage on floats</title>
<style>@page { size:5in 3in; margin:0.5in; }</style>
<body style="margin: 0">
<div style="height: 2in; width: 1in; background: aqua"></div>
<div style="height: 1in; width: 1in; background: yellow; page-break-before: always"></div>
<div style="height: 1in; width: 1in; background: aqua; page-break-before: always"></div>
<div style="height: 1in; width: 1in; background: yellow"></div>

Просмотреть файл

@ -1,6 +1,7 @@
<!DOCTYPE HTML>
<html class="reftest-paged">
<title>Test for setting and handling of mIsTopOfPage on floats</title>
<style>@page { size:5in 3in; margin:0.5in; }</style>
<body style="margin: 0">
<div style="float: left">
<div><div style="display:inline-block; vertical-align: top; height: 3in; width: 1in; background: aqua"></div></div>

Просмотреть файл

@ -1,13 +1,13 @@
<!DOCTYPE HTML>
<html class="reftest-paged">
<title>Test for setting and handling of mIsTopOfPage on floats</title>
<style>@page { size:5in 3in; margin:0.5in; }</style>
<body style="margin: 0">
<div>
<div style="display:inline-block; vertical-align: top; height: 1in; width: 1in; background: fuchsia"></div
><div style="display:inline-block; vertical-align: top; height: 2in; width: 1in; background: aqua"></div>
</div>
<div style="page-break-before:always">
<!-- FIXME: uncomment this when bug 511551 is fixed
<div style="display:inline-block; vertical-align: top; height: 1in; width: 1in"></div
>--><div style="display:inline-block; vertical-align: top; height: 1in; width: 1in; background: yellow"></div>
<div style="display:inline-block; vertical-align: top; height: 1in; width: 1in"></div><div style="display:inline-block; vertical-align: top; height: 1in; width: 1in; background: aqua"></div>
</div><div style="height: 1in; width: 1in; background: yellow"></div>
</div>

Просмотреть файл

@ -1,6 +1,7 @@
<!DOCTYPE HTML>
<html class="reftest-paged">
<title>Test for setting and handling of mIsTopOfPage on floats</title>
<style>@page { size:5in 3in; margin:0.5in; }</style>
<body style="margin: 0">
<div style="float: left; height: 1in; width: 1in; background: fuchsia"></div>
<div style="float: left">

Просмотреть файл

@ -1,7 +1,9 @@
<!DOCTYPE HTML>
<html class="reftest-paged">
<title>Test for setting and handling of mIsTopOfPage on floats</title>
<style>@page { size:5in 3in; margin:0.5in; }</style>
<body style="margin: 0">
<div style="height: 2in"></div>
<div style="height: 2in; width: 1in; background: aqua; page-break-before: always"></div>
<div style="height: 1in; width: 1in; background: yellow; page-break-before: always"></div>
<div style="height: 1in; width: 1in; background: aqua; page-break-before: always"></div>
<div style="height: 1in; width: 1in; background: yellow"></div>

Просмотреть файл

@ -1,6 +1,7 @@
<!DOCTYPE HTML>
<html class="reftest-paged">
<title>Test for setting and handling of mIsTopOfPage on floats</title>
<style>@page { size:5in 3in; margin:0.5in; }</style>
<body style="margin: 0">
<div style="height: 1in"></div>
<div style="float: left">

Просмотреть файл

@ -1,8 +1,10 @@
<!DOCTYPE HTML>
<html class="reftest-paged">
<title>Test for setting and handling of mIsTopOfPage on floats</title>
<style>@page { size:5in 3in; margin:0.5in; }</style>
<body style="margin: 0">
<div style="height: 1in"></div>
<div style="height: 1in; width: 1in; background: fuchsia"></div>
<div style="height: 2in; width: 1in; background: aqua; page-break-before: always"></div>
<div style="height: 1in; width: 1in; background: yellow; page-break-before: always"></div>
<div style="height: 1in; width: 1in; background: aqua; page-break-before: always"></div>
<div style="height: 1in; width: 1in; background: yellow"></div>

Просмотреть файл

@ -1,6 +1,7 @@
<!DOCTYPE HTML>
<html class="reftest-paged">
<title>Test for setting and handling of mIsTopOfPage on floats</title>
<style>@page { size:5in 3in; margin:0.5in; }</style>
<body style="margin: 0">
<div style="height: 1in"></div>
<div style="float: left; height: 1in; width: 1in; background: fuchsia"></div>

Просмотреть файл

@ -1,10 +1,10 @@
<!DOCTYPE html>
<!-- This test assumes that the document is 2in tall by 4in wide. -->
<html style="margin: 0; padding: 0; border: none; height: 100%; overflow: hidden"
<style>@page { size:5in 3in; margin:0.5in; }</style>
<html style="margin: 0; padding: 0; border: none; height: 100%"
class="reftest-paged">
<body style="margin: 0; padding: 0; border: none; height: 100%">
<div style="float: left; height: 100%; background: green">
<img src="solidblue.png" style="height: 100%; visibility: hidden;">
<img src="solidblue.png" style="height: 100%; visibility: hidden; vertical-align:top;">
</div>
</body>
</html>

Просмотреть файл

@ -1491,10 +1491,10 @@ fuzzy-if(Android,0-2,0-48) == 563584-7.html 563584-7-ref.html
# FIXME: It would be nice to have variants of these -8 tests for the
# table narrowing quirk causing a change to mIsTopOfPage (though I'm not
# entirely sure our behavior is the right one, either).
fuzzy-if(Android,0-2,0-48) == 563584-8a.html 563584-8a-ref.html
fuzzy-if(Android,0-2,0-48) == 563584-8b.html 563584-8b-ref.html
fuzzy-if(Android,0-4,0-180) == 563584-8c.html 563584-8c-ref.html
fuzzy-if(Android,0-4,0-180) == 563584-8d.html 563584-8d-ref.html
pref(layout.display-list.improve-fragmentation,true) fuzzy-if(Android,0-2,0-48) == 563584-8a.html 563584-8a-ref.html
pref(layout.display-list.improve-fragmentation,true) fuzzy-if(Android,0-2,0-48) == 563584-8b.html 563584-8b-ref.html
pref(layout.display-list.improve-fragmentation,true) fuzzy-if(Android,0-4,0-180) == 563584-8c.html 563584-8c-ref.html
pref(layout.display-list.improve-fragmentation,true) fuzzy-if(Android,0-4,0-180) == 563584-8d.html 563584-8d-ref.html
== 563584-9a.html 563584-9a-ref.html
== 563584-9b.html 563584-9b-ref.html
== 563584-9c.html 563584-9cd-ref.html

Просмотреть файл

@ -15,39 +15,34 @@ html,body {
.grid {
display: grid;
grid-template-columns: 0.6in 0.6in 0.6in;
grid-auto-rows: 1in;
grid-gap: 0.1in;
height: 1in;
border: 0.1in solid;
align-items: start;
}
span { display:block; background:lime; border:0.05in solid black; }
x { display:block; height:0.2in; }
.t { border-bottom-width:0; }
.b { border-top-width:0; }
br { page-break-after:always; break-after:always; display:block; height:1px; }
.col {
height: 0;
width: 0.6in;
}
.col > div {
height: 1in;
position: relative;
background: lime;
border: 0.05in solid black;
}
</style>
</head>
<body>
<div style="padding-top:1in; background:grey">
<div class="grid t">
<span class="t" style="align-self:stretch"><x style="height:auto"></x></span>
</div>
<div class="grid b" style="border-color:transparent; grid-auto-rows: 0;">
<span class="b" style="min-height:0"><x style="height:0.04in"></x></span>
<div class="grid">
<div class="col"><div></div></div>
</div>
</div>
<div style="padding-top:0.91in; background:grey;">
<div class="grid t" style="height:0.9in">
<span class="t" style="height:0.86in"><x></x></span>
<div style="padding-top:1in; background:grey;">
<div class="grid">
<div class="col"><div></div></div>
</div>
</div>
<div class="grid b" style="border-color:transparent; grid-auto-rows: 0;">
<span class="b" style="min-height:0"><x style="height:0.04in"></x></span>
</div>
</body>
</html>

Просмотреть файл

@ -193,7 +193,7 @@ test-pref(layout.css.serialize-grid-implicit-tracks,false) == grid-repeat-auto-f
== grid-fragmentation-010.html grid-fragmentation-010-ref.html
== grid-fragmentation-011.html grid-fragmentation-011-ref.html
== grid-fragmentation-012.html grid-fragmentation-012-ref.html
== grid-fragmentation-013.html grid-fragmentation-013-ref.html
pref(layout.display-list.improve-fragmentation,true) == grid-fragmentation-013.html grid-fragmentation-013-ref.html
== grid-fragmentation-014.html grid-fragmentation-014-ref.html
asserts(0-10) == grid-fragmentation-015.html grid-fragmentation-015-ref.html # bug 1144852 (due to vertical writing-mode)
== grid-fragmentation-016.html grid-fragmentation-016-ref.html

Просмотреть файл

@ -7,13 +7,18 @@
<style>
@page { size:5in 3in; margin:0.5in; }
html,body {
color:black; background-color:white; font:0.5in/1 monospace; padding:0; margin:0;
color:black; background-color:white; font:1px/1 monospace; padding:0; margin:0;
}
.before, .after {
height: 0.5in;
content: "x";
background: black;
}
</style>
</head>
<body>
BEFORE
<div class="before"></div>
<div style="height:1in; width:1in; background:black"></div>
AFTER
<div class="after"></div>
</body>
</html>

Просмотреть файл

@ -7,12 +7,17 @@
<style>
@page { size:5in 3in; margin:0.5in; }
html,body {
color:black; background-color:white; font:0.5in/1 monospace; padding:0; margin:0;
color:black; background-color:white; font:1px/1 monospace; padding:0; margin:0;
}
.before, .after {
height: 0.5in;
content: "x";
background: black;
}
</style>
</head>
<body>
BEFORE
<div class="before"></div>
<div style="display:flow-root">
<div style="overflow:hidden; position:relative; min-height:1in">
<div style="position:absolute">
@ -20,6 +25,6 @@ html,body {
</div>
</div>
</div>
AFTER
<div class="after"></div>
</body>
</html>

Просмотреть файл

@ -7,12 +7,17 @@
<style>
@page { size:5in 3in; margin:0.5in; }
html,body {
color:black; background-color:white; font:0.5in/1 monospace; padding:0; margin:0;
color:black; background-color:white; font:1px/1 monospace; padding:0; margin:0;
}
.before, .after {
height: 0.5in;
content: "x";
background: black;
}
</style>
</head>
<body>
BEFORE
<div class="before"></div>
<div style="overflow:hidden; height:1in">
<div style="overflow:hidden">
<div style="float: left">
@ -20,6 +25,6 @@ html,body {
</div>
</div>
</div>
AFTER
<div class="after"></div>
</body>
</html>

Просмотреть файл

@ -73,14 +73,13 @@ fuzzy-if(skiaContent,0-1,0-23) == resize-reflow-001.html resize-reflow-001.ref.h
== table-cell-breaking-1b.html table-cell-breaking-1-ref.html
== table-cell-breaking-2a.html table-cell-breaking-2-ref.html
== table-cell-breaking-2b.html table-cell-breaking-2-ref.html
# Note: table-cell-breaking-3a.html should match table-cell-breaking-3-ref.html, but
# currently it renders the same as table-cell-breaking-3a-ref.html.
== table-cell-breaking-3a.html table-cell-breaking-3a-ref.html
fails == table-cell-breaking-3a.html table-cell-breaking-3-ref.html
asserts(1-1) == table-cell-breaking-3b.html table-cell-breaking-3-ref.html
pref(layout.display-list.improve-fragmentation,false) == table-cell-breaking-3a.html table-cell-breaking-3a-ref.html
pref(layout.display-list.improve-fragmentation,true) == table-cell-breaking-3a.html table-cell-breaking-3-ref.html
asserts(1-1) pref(layout.display-list.improve-fragmentation,false) == table-cell-breaking-3b.html table-cell-breaking-3-ref.html # bug 714667
asserts(1-1) pref(layout.display-list.improve-fragmentation,true) fails == table-cell-breaking-3b.html table-cell-breaking-3-ref.html # assert is bug 714667, fails due to bug 1681063
== column-balancing-break-inside-avoid-2.html column-balancing-break-inside-avoid-2-ref.html
fuzzy-if(Android,0-4,0-2) fuzzy-if(swgl,0-1,0-35) == combobox-page-break-inside.html combobox-page-break-inside-ref.html
fuzzy-if(OSX,23-23,1-1) == table-nested-1308876-1.xhtml table-nested-1308876-1-ref.html
pref(layout.display-list.improve-fragmentation,false) fuzzy-if(OSX,23-23,1-1) == table-nested-1308876-1.xhtml table-nested-1308876-1-ref.html # bug 1681063
== contain-size-break-001.html contain-size-break-001-ref.html
== contain-size-break-002.html contain-size-break-002-ref.html
== contain-size-break-003.html contain-size-break-003-ref.html