corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 750293 - Don't include a block's margins in its scrollable overflow for now. r=roc

Browse Source
This commit is contained in:
Mats Palmgren
2012-05-17 01:04:38 +02:00
parent edce81f622
commit f412cd3cb1
3 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
layout/generic/nsFrame.cpp
View File

@@ -6771,26 +6771,6 @@ nsIFrame::FinishAndStoreOverflow(nsOverflowAreas& aOverflowAreas,
nsRect& o = aOverflowAreas.Overflow(otype); nsRect& o = aOverflowAreas.Overflow(otype);
o.UnionRectEdges(o, bounds); o.UnionRectEdges(o, bounds);
} }
if (!nsLayoutUtils::IsPopup(this)) {
// Include margin in scrollable overflow.
// 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();
so.SaturatingUnionRectEdges(so, marginBounds);
}
} }
// Note that NS_STYLE_OVERFLOW_CLIP doesn't clip the frame background, // Note that NS_STYLE_OVERFLOW_CLIP doesn't clip the frame background,

4
layout/reftests/margin-collapsing/scrollable-horizontal-margin-ref.html
View File

@@ -11,14 +11,14 @@
x1,x2,x3,x4,x5,x6 { display:block; } x1,x2,x3,x4,x5,x6 { display:block; }
x2 { overflow:auto; width:100px; background:grey; } x2 { overflow:auto; width:100px; background:grey; }
x4 { width: 70px; } x4 { width: 70px; }
x3 { width: 70px; padding: 0 20px; } x3 { width: 70px; padding-left: 20px; padding-right: 10px; }
</style> </style>
</head> </head>
<body> <body>
<x1><x2 style="height:50px;"> <x1><x2 style="height:50px;">
<x3><x4 style="height:20px; background:lime; "></x4></x3> <x3><x4 style="height:20px; background:lime; "></x4></x3>
</x2> </x2></x1>
</body> </body>

2
layout/reftests/margin-collapsing/scrollable-horizontal-margin.html
View File

@@ -17,7 +17,7 @@ x4 { width: 70px; margin: 0 20px; }
<x1><x2 style="height:50px;"> <x1><x2 style="height:50px;">
<x4 style="height:20px; background:lime; "></x4> <x4 style="height:20px; background:lime; "></x4>
</x2> </x2></x1>
</body> </body>