Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bug 724352 - Don't add vertical margin to scrollable overflow here, i…
…t'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, a=akeybl
- Loading branch information
1 parent
988f85c
commit d1256e5
Showing
6 changed files
with
191 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
layout/reftests/margin-collapsing/scrollable-horizontal-margin-ref.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 changes: 24 additions & 0 deletions
24
layout/reftests/margin-collapsing/scrollable-horizontal-margin.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 changes: 66 additions & 0 deletions
66
layout/reftests/margin-collapsing/scrollable-vertical-margin-ref.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 changes: 65 additions & 0 deletions
65
layout/reftests/margin-collapsing/scrollable-vertical-margin.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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> |