wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 614969 - Use the primary frame for the display style test. r=bzbarsky

Browse Source
This commit is contained in:
Mats Palmgren 2011-04-04 13:41:02 +02:00
parent 395ec2ab5c
commit 73a0c83824
7 changed files with 102 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/generic/nsBlockFrame.cpp
View File

@ -6736,6 +6736,7 @@ nsBlockFrame::RenumberListsFor(nsPresContext* aPresContext,
// if the frame is a placeholder, then get the out of flow frame
nsIFrame* kid = nsPlaceholderFrame::GetRealFrameFor(aKid);
const nsStyleDisplay* display = kid->GetStyleDisplay();
// drill down through any wrappers to the real frame
kid = kid->GetContentInsertionFrame();
@ -6749,7 +6750,6 @@ nsBlockFrame::RenumberListsFor(nsPresContext* aPresContext,
// If the frame is a list-item and the frame implements our
// block frame API then get its bullet and set the list item
// ordinal.
const nsStyleDisplay* display = kid->GetStyleDisplay();
if (NS_STYLE_DISPLAY_LIST_ITEM == display->mDisplay) {
// Make certain that the frame is a block frame in case
// something foreign has crept in.

25
layout/reftests/list-item/numbering-1-ref.html Normal file
View File

@ -0,0 +1,25 @@
<!DOCTYPE HTML>
<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title>Testcase #1 for bug 614969</title>
</head>
<body>
<ol style="list-style: decimal inside">
<li>List item 1</li>
<li>List item 2</li>
<li>List item 3</li>
<li>List item 4</li>
<li>List item 5</li>
<li>List item 6</li>
<div><li>List item 7</li></div>
</ol>
<ol style="list-style: decimal inside;">
<div style="-moz-column-width:1em; column-width:1em;"><li></li><div>item1</div></div>
<div style="-moz-column-width:1em; column-width:1em;"><li></li><div>item2</div></div>
<div style="-moz-column-width:1em; column-width:1em;"><li></li><div>item3</div></div>
</ol>
</body>
</html>

25
layout/reftests/list-item/numbering-1.html Normal file
View File

@ -0,0 +1,25 @@
<!DOCTYPE HTML>
<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title>Testcase #1 for bug 614969</title>
</head>
<body>
<ol style="list-style: decimal inside">
<li style="overflow: hidden">List item 1</li>
<li style="overflow: hidden">List item 2</li>
<li>List item 3</li>
<li style="overflow: hidden">List item 4</li>
<li style="overflow: hidden">List item 5</li>
<li>List item 6</li>
<div style="overflow: hidden"><li>List item 7</li></div>
</ol>
<ol style="list-style: decimal inside;">
<li style="-moz-column-width:1em; column-width:1em;">item1</li>
<li style="-moz-column-width:1em; column-width:1em;">item2</li>
<li style="-moz-column-width:1em; column-width:1em;">item3</li>
</ol>
</body>
</html>

23
layout/reftests/list-item/numbering-2-ref.html Normal file
View File

@ -0,0 +1,23 @@
<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title>Testcase #2 for bug 614969</title>
<style>
html,body {
color:black; background-color:white; font-size:12px; padding:0; margin:0;
}
li {margin-left:0; padding-left:0px; }
ol {margin-left:0; padding-left:40px; }
</style>
</head>
<body>
<div style="position:absolute;left:0;top:0"><ol style="list-style: decimal inside"><li style="height:0;">ABS</li><li style="padding-top:1em">List item</li></ol></div>
<div style="position:absolute;left:0;top:3em"><div style="position:relative"><ol style="list-style: decimal inside"><li>REL BLOCK</li><li style="padding-top:1em">List item</li></ol></div></div>
<div style="position:absolute;left:0;top:7em"><div style="float:left"><ol style="list-style: decimal inside"><li style="height:2em;">FLOAT</li><li style="">List item</li></ol></div></div>
<div style="position:absolute;left:0;top:10em"><ol style="list-style: decimal inside"><li>REL INLINE</li><li style="padding-top:1em">List item</li></ol></div>
<div style="position:absolute;left:0;top:14em"><ol style="list-style: decimal inside"><ol><li>REL OL</li></ol><li style="padding-top:1em">List item</li></ol></div>
<div style="position:absolute;left:0;top:20em"><ol id=x style="list-style: decimal inside"><ol style="height:0"><li style="margin-left:-40px;">ABS OL</li></ol><li style="padding-top:2em">List item</li></ol></div>
</body>
</html>

23
layout/reftests/list-item/numbering-2.html Normal file
View File

@ -0,0 +1,23 @@
<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title>Testcase #2 for bug 614969</title>
<style>
html,body {
color:black; background-color:white; font-size:12px; padding:0; margin:0;
}
li {margin-left:0; padding-left:0px; }
ol {margin-left:0; padding-left:40px; }
</style>
</head>
<body>
<div style="position:absolute;left:0;top:0"><ol style="list-style: decimal inside"><div style="position:absolute"><li>ABS</li></div><li style="padding-top:1em">List item</li></ol></div>
<div style="position:absolute;left:0;top:3em"><ol style="list-style: decimal inside"><div style="position:relative"><li>REL BLOCK</li></div><li style="padding-top:1em">List item</li></ol></div>
<div style="position:absolute;left:0;top:7em"><ol style="list-style: decimal inside"><div style="float:left;height:2em"><li>FLOAT</li></div><li style="padding-top:1em">List item</li></ol></div>
<div style="position:absolute;left:0;top:10em"><ol style="list-style: decimal inside"><span style="position:relative"><li>REL INLINE</li></span><li style="padding-top:1em">List item</li></ol></div>
<div style="position:absolute;left:0;top:14em"><ol style="list-style: decimal inside"><ol style="position:relative"><li>REL OL</li></ol><li style="padding-top:1em">List item</li></ol></div>
<div style="position:absolute;left:0;top:20em"><ol id="x" style="list-style: decimal inside"><ol id="y" style="position:absolute;left:0;right:0"><li>ABS OL</li></ol><li style="padding-top:2em">List item</li></ol></div>
</body>
</html>

2
layout/reftests/list-item/reftest.list Normal file
View File

@ -0,0 +1,2 @@
== numbering-1.html numbering-1-ref.html
== numbering-2.html numbering-2-ref.html

3
layout/reftests/reftest.list
View File

@ -176,6 +176,9 @@ include layers/reftest.list
# line-breaking/
include line-breaking/reftest.list
# list-item/
include list-item/reftest.list
# mathml/
include mathml/reftest.list