diff options
Diffstat (limited to '')
8 files changed, 64 insertions, 39 deletions
diff --git a/layout/reftests/pagination/reftest.list b/layout/reftests/pagination/reftest.list index 6946a3126a..a26bf56b31 100644 --- a/layout/reftests/pagination/reftest.list +++ b/layout/reftests/pagination/reftest.list @@ -51,11 +51,11 @@ fuzzy(0-1,0-23) == resize-reflow-001.html resize-reflow-001.ref.html == table-page-break-after-always-1.html table-page-break-before-auto-2-ref.html == table-page-break-after-left-1.html table-page-break-before-auto-2-ref.html == table-page-break-after-right-1.html table-page-break-before-auto-2-ref.html -== rowgroup-page-break-after-always-1.html table-page-break-before-auto-2-ref.html -== row-page-break-after-always-1.html table-page-break-before-auto-2-ref.html -== row-page-break-after-always-2.html table-page-break-before-auto-2-ref.html -== rowgroup-thead-page-break-after-always-1.html table-page-break-before-auto-3-ref.html -== rowgroup-tfoot-page-break-after-always-1.html table-page-break-before-auto-3-ref.html +== rowgroup-page-break-after-always-1.html rowgroup-page-break-after-always-1-ref.html +== row-page-break-after-always-1.html rowgroup-page-break-after-always-1-ref.html +== row-page-break-after-always-2.html rowgroup-page-break-after-always-1-ref.html +== rowgroup-thead-page-break-after-always-1.html rowgroup-page-break-after-always-2-ref.html +== rowgroup-tfoot-page-break-after-always-1.html rowgroup-page-break-after-always-2-ref.html == table-tfoot-thead-1.html table-tfoot-thead-1-ref.html == table-caption-splitrowgroup-1.html table-caption-splitrowgroup-1-ref.html == table-caption-splitaftercaption-1.html table-caption-splitaftercaption-1-ref.html @@ -75,7 +75,7 @@ asserts(1-1) pref(layout.display-list.improve-fragmentation,false) == table-cell 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 -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 +pref(layout.display-list.improve-fragmentation,false) == 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 diff --git a/layout/reftests/pagination/rowgroup-page-break-after-always-1-ref.html b/layout/reftests/pagination/rowgroup-page-break-after-always-1-ref.html new file mode 100644 index 0000000000..130833dbba --- /dev/null +++ b/layout/reftests/pagination/rowgroup-page-break-after-always-1-ref.html @@ -0,0 +1,18 @@ +<!DOCTYPE html> +<html class="reftest-paged"> + <style> + div.spacer { height: 50px; width: 50px; border: thin solid green;} + </style> + + <table> + <tbody> + <tr><td><div class="spacer"></div></td></tr> + </tbody> + </table> + <div style="page-break-after: always"></div> + <table style="position: relative; top: -2px"> + <tbody> + <tr><td><div class="spacer"></div></td></tr> + </tbody> + </table> +</html> diff --git a/layout/reftests/pagination/rowgroup-page-break-after-always-2-ref.html b/layout/reftests/pagination/rowgroup-page-break-after-always-2-ref.html new file mode 100644 index 0000000000..9a47194f61 --- /dev/null +++ b/layout/reftests/pagination/rowgroup-page-break-after-always-2-ref.html @@ -0,0 +1,24 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" + "http://www.w3.org/TR/html4/strict.dtd"> +<html lang="en-US" class="reftest-paged"> +<head> +<style type="text/css"> +div.spacer { height: 50px; width: 50px; border:thin solid green;} +</style> +</head> +<body> +<table> +<thead><tr><td><div class="spacer"></div></td></tr></thead> +<tbody> +<tr><td><div class="spacer"></div></td></tr> +</tbody> +</table> +<div style= "page-break-after: always"></div> +<table style="position: relative; top: -2px"> +<thead><tr><td><div class="spacer"></div></td></tr></thead> +<tbody> +<tr><td><div class="spacer"></div></td></tr> +</tbody> +</table> +</body> +</html> diff --git a/layout/reftests/pagination/table-caption-splitaftercaption-5-ref.html b/layout/reftests/pagination/table-caption-splitaftercaption-5-ref.html index b66fef887f..c6cd61a08f 100644 --- a/layout/reftests/pagination/table-caption-splitaftercaption-5-ref.html +++ b/layout/reftests/pagination/table-caption-splitaftercaption-5-ref.html @@ -4,20 +4,22 @@ <head> <style type="text/css"> div.spacer { height: 0px; width: 0px; padding: 0.2in;border:thin solid green;} -caption {margin-top: 0.15in; margin-bottom:0.15in; caption-side:bottom} +.caption {margin-top: 0.15in; margin-bottom:0.15in; + position: absolute; bottom: 0;} table {margin-top: 0.15in; margin-bottom:0.15in} </style> </head> <body> <table cellspacing="0" cellpadding="0"> -<caption><div class="spacer"></div></caption> <tbody> <tr><td><div class="spacer"></div></td></tr> </tbody> <tfoot><tr><td><div class="spacer"></div></td></tr></tfoot> </table> +<div class="caption"><div class="spacer"></div></div> + <table cellspacing="0" cellpadding="0" style="page-break-before:always"> <tbody> <tr><td><div class="spacer"></div></td></tr> diff --git a/layout/reftests/pagination/table-nested-1308876-1-ref.html b/layout/reftests/pagination/table-nested-1308876-1-ref.html index ba8cd989aa..f5521cda37 100644 --- a/layout/reftests/pagination/table-nested-1308876-1-ref.html +++ b/layout/reftests/pagination/table-nested-1308876-1-ref.html @@ -6,15 +6,16 @@ correct, but I'd at least like to know about it if it changes, given how little test coverage of this we currently have. --> <style> +@page { size: 5in 3in; margin: 0.5in; } html, body { margin: 0; padding: 0; } </style> -<div id="page1" style="border: 2px solid black; background: yellow; height: 2in; box-sizing: border-box; padding: 3px; width: min-content"> - <div style="background: orange; height: calc(2in - 15px); padding: 3px;"> +<div id="page1" style="border: 2px solid black; border-bottom: 0; height: 2in; box-sizing: border-box; background: yellow; padding: 3px; padding-bottom: 0; width: min-content"> + <div id="or" style="background: orange; height: calc(2in - 5px - 6px); padding: 3px;"> <div style="background: brown; color: black;padding: 1px;">A</div> </div> </div> -<div id="page2" style="border: 2px solid black; background: yellow; height: 2in; box-sizing: border-box; padding: 2px 3px 3px 3px; border-bottom: none; padding-bottom: 0; width: min-content"> - <div style="background: orange; height: calc(2in - 6px); padding: 2px 3px 0 3px"> - <div style="border: 1px solid fuchsia; background: aqua; height: calc(2in - 7px); border-bottom: none; color: transparent">A</div> +<div id="page2" style="border: solid black; border-width: 0 2px; background: yellow; height: 2in; box-sizing: border-box; padding: 0 3px; width: min-content"> + <div style="background: orange; height: 2in; padding: 0 3px"> + <div style="border: 1px solid fuchsia; background: aqua; height: calc(2in - 1px); border-bottom: none; color: transparent">A</div> </div> </div> diff --git a/layout/reftests/pagination/table-nested-1308876-1.xhtml b/layout/reftests/pagination/table-nested-1308876-1.xhtml index 3a804949c4..023b77429c 100644 --- a/layout/reftests/pagination/table-nested-1308876-1.xhtml +++ b/layout/reftests/pagination/table-nested-1308876-1.xhtml @@ -2,6 +2,10 @@ <!-- Reduced from layout/base/crashtests/470851-1.xhtml and turned into a reftest. --> +<style> +@page { size: 5in 3in; margin: 0.5in; } +html, body { margin: 0; padding: 0; } +</style> <table style="background: black"> <tbody> <tr> @@ -15,7 +19,7 @@ Reduced from layout/base/crashtests/470851-1.xhtml and turned into a reftest. <tr><td>A</td></tr> </tbody> <tbody style="background: fuchsia"> - <tr><td><div style="background: aqua; line-height: 4in">A</div></td></tr> + <tr><td><div style="background: aqua; line-height: 4in; color: transparent">A</div></td></tr> </tbody> </table> </td> diff --git a/layout/reftests/pagination/table-page-break-before-auto-3-ref.html b/layout/reftests/pagination/table-page-break-before-auto-3-ref.html deleted file mode 100644 index 72f5960ac2..0000000000 --- a/layout/reftests/pagination/table-page-break-before-auto-3-ref.html +++ /dev/null @@ -1,24 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" - "http://www.w3.org/TR/html4/strict.dtd"> -<html lang="en-US" class="reftest-paged"> -<head> -<style type="text/css"> -div.spacer { height: 50px; width: 50px; border:thin solid green;} -</style> -</head> -<body> -<table> -<thead><tr><td><div class="spacer"></div></td></tr></thead> -<tbody> -<tr><td><div class="spacer"></div></td></tr> -</tbody> -</table> -<div style= "page-break-after: always"></div> -<table> -<thead><tr><td><div class="spacer"></div></td></tr></thead> -<tbody> -<tr><td><div class="spacer"></div></td></tr> -</tbody> -</table> -</body> -</html> diff --git a/layout/reftests/pagination/table-tfoot-thead-1-ref.html b/layout/reftests/pagination/table-tfoot-thead-1-ref.html index 469027d86a..9c730dea1b 100644 --- a/layout/reftests/pagination/table-tfoot-thead-1-ref.html +++ b/layout/reftests/pagination/table-tfoot-thead-1-ref.html @@ -18,7 +18,7 @@ thead div.spacer{height: 140px} <tbody><tr><td><div class="spacer"></div></td></tr></tbody> </table> -<table cellspacing="1" cellpadding="0"> +<table cellspacing="1" cellpadding="0" style="position: relative; top: -1px"> <tbody> <tr><td><div class="spacer"></div></td></tr></tbody> <tfoot><tr><td><div class="spacer"></div></td></tr></tfoot> </table> |