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 724352 - Don't add vertical margin to scrollable overflow here, it's already done during reflow and we don't need it for UpdateOverflow yet (and we need to account for margin-collapsing when we do). r=roc

Browse Source
This commit is contained in:
Mats Palmgren 2012-04-05 16:30:21 +02:00
parent 0e8c2ee5e7
commit 8948c2c199
6 changed files with 191 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
layout/generic/nsFrame.cpp
View File

@ -6720,6 +6720,15 @@ nsIFrame::FinishAndStoreOverflow(nsOverflowAreas& aOverflowAreas,
// XXX In theory this should consider margin collapsing
nsRect marginBounds(bounds);
nsMargin margin = GetUsedMargin();
// Bug 724352 - vertical scrollable overflow only matters for
// scroll frames which are block margin roots and has already
// accumulated child vertical margins during reflow. We need
// to revisit this when using UpdateOverflow for non-transform
// style changes (bug 719177).
margin.top = 0;
margin.bottom = 0;
ApplySkipSides(margin);
marginBounds.SaturatingInflate(margin);
nsRect& so = aOverflowAreas.ScrollableOverflow();

2
layout/reftests/margin-collapsing/reftest.list
View File

@ -324,3 +324,5 @@ fails == block-clear-7g-left.html block-clear-7efgh-left-ref2.html # Bug 493380
== block-zero-min-height-3d.html block-zero-min-height-3-ref.html
== block-percent-1.html block-percent-1-ref.html
== dynamic-add-text-1.html dynamic-add-text-1-ref.html # Bug 467321
== scrollable-vertical-margin.html scrollable-vertical-margin-ref.html
== scrollable-horizontal-margin.html scrollable-horizontal-margin-ref.html

25
layout/reftests/margin-collapsing/scrollable-horizontal-margin-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 for bug 724352</title>
<style type="text/css">
html,body {
color:black; background-color:white; font-size:16px; padding:0; margin:0;
}
x1,x2,x3,x4,x5,x6 { display:block; }
x2 { overflow:auto; width:100px; background:grey; }
x4 { width: 70px; }
x3 { width: 70px; padding: 0 20px; }
</style>
</head>
<body>
<x1><x2 style="height:50px;">
<x3><x4 style="height:20px; background:lime; "></x4></x3>
</x2>
</body>
</html>

24
layout/reftests/margin-collapsing/scrollable-horizontal-margin.html Normal file
View File

@ -0,0 +1,24 @@
<!DOCTYPE HTML>
<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title>Testcase for bug 724352</title>
<style type="text/css">
html,body {
color:black; background-color:white; font-size:16px; padding:0; margin:0;
}
x1,x2,x3,x4,x5,x6 { display:block; }
x2 { overflow:auto; width:100px; background:grey; }
x4 { width: 70px; margin: 0 20px; }
</style>
</head>
<body>
<x1><x2 style="height:50px;">
<x4 style="height:20px; background:lime; "></x4>
</x2>
</body>
</html>

66
layout/reftests/margin-collapsing/scrollable-vertical-margin-ref.html Normal file
View File

@ -0,0 +1,66 @@
<!DOCTYPE HTML>
<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title>Testcase for bug 724352</title>
<style type="text/css">
html,body {
color:black; background-color:white; font-size:16px; padding:0; margin:0;
}
x1,x2,x3,x4,x5,x6 { display:block; }
x7 {display:block; height:20px;background:lime;}
</style>
</head>
<body>
<x1><x2 style="overflow:auto; background:grey; height:50px;">
<x3><x4 style="padding:20px 0 10px 0; height:20px;"><x7></x7></x4></x3>
</x2>
<x6 style="padding-top:10px">x</x6></x1>
<x1><x2 style="overflow:auto; background:grey; height:70px;">
<x3 style="padding-bottom:30px"><x4 style="padding-top:20px; height:20px;"><x7></x7></x4></x3>
</x2>
<x6 style="padding-top:10px">x</x6></x1>
<x1><x2 style="overflow:auto; background:grey; height:60px;">
<x3 style="padding-bottom:10px"><x4 style="padding-top:20px; height:20px;"><x7></x7></x4></x3>
</x2>
<x6 style="padding-top:10px">x</x6></x1>
<x1><x2 style="overflow:auto; background:grey; height:50px;">
<x3 style="padding-bottom:10px"><x4 style="padding-top:20px; height:20px;"><x7></x7></x4></x3>
</x2>
<x6 style="padding-top:10px">x</x6></x1>
<x1><x2 style="overflow:auto; background:grey; height:60px;">
<x3><x4 style="padding:20px 0; height:20px;"><x7></x7></x4></x3>
</x2>
<x6 style="padding-top:10px">x</x6></x1>
<x1><x2 style="overflow:auto; background:grey; height:60px;">
<x3><x4 style="padding:20px 0; height:20px;"><x7></x7></x4></x3>
</x2>
<x6 style="padding-top:10px">x</x6></x1>
<x1><x2 style="overflow:auto; background:grey; height:50px;">
<x3><x4 style="padding:10px 0 20px 0; height:20px;"><x7></x7></x4></x3>
</x2>
<x6 style="padding-top:10px">x</x6></x1>
</body>
</html>

65
layout/reftests/margin-collapsing/scrollable-vertical-margin.html Normal file
View File

@ -0,0 +1,65 @@
<!DOCTYPE HTML>
<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title>Testcase for bug 724352</title>
<style type="text/css">
html,body {
color:black; background-color:white; font-size:16px; padding:0; margin:0;
}
x1,x2,x3,x4,x5,x6 { display:block; }
</style>
</head>
<body>
<x1><x2 style="overflow:auto; background:grey; height:50px;">
<x3 style="margin-bottom:-10px"><x4 style="margin:20px 0; height:20px; background:lime; "></x4></x3>
</x2>
<x6 style="margin-top:10px">x</x6></x1>
<x1><x2 style="overflow:auto; background:grey; height:70px;">
<x3 style="margin-bottom:30px"><x4 style="margin:20px 0; height:20px; background:lime; "></x4></x3>
</x2>
<x6 style="margin-top:10px">x</x6></x1>
<x1><x2 style="overflow:auto; background:grey; height:60px;">
<x3 style="margin-bottom:10px"><x4 style="margin:20px 0; height:20px; background:lime; "></x4></x3>
</x2>
<x6 style="margin-top:10px">x</x6></x1>
<x1><x2 style="overflow:auto; background:grey; height:50px;">
<x3 style="margin-bottom:20px"><x4 style="margin:20px 0 -10px 0; height:20px; background:lime; "></x4></x3>
</x2>
<x6 style="margin-top:10px">x</x6></x1>
<x1><x2 style="overflow:auto; background:grey; height:60px;">
<x3 style="margin-bottom:20px"><x4 style="margin:20px 0; height:20px; background:lime; "></x4></x3>
</x2>
<x6 style="margin-top:10px">x</x6></x1>
<x1><x2 style="overflow:auto; background:grey; height:60px;">
<x3 style="margin-top:20px"><x4 style="margin:20px 0; height:20px; background:lime; "></x4></x3>
</x2>
<x6 style="margin-top:10px">x</x6></x1>
<x1><x2 style="overflow:auto; background:grey; height:50px;">
<x3 style="margin-top:-10px"><x4 style="margin:20px 0; height:20px; background:lime; "></x4></x3>
</x2>
<x6 style="margin-top:10px">x</x6></x1>
</body>
</html>