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 998535 - Fix ConsumedHeight calculations so that they will work also for box-decoration-break:clone. r=roc

Browse Source
This commit is contained in:
Mats Palmgren 2014-05-12 11:45:28 +00:00
parent 8eb6039ff7
commit 12580f2489
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
layout/generic/nsSplittableFrame.cpp
View File

@ -210,12 +210,9 @@ nscoord
nsSplittableFrame::GetConsumedHeight() const nsSplittableFrame::GetConsumedHeight() const
{ {
nscoord height = 0; nscoord height = 0;
// Reduce the height by the computed height of prev-in-flows.
for (nsIFrame* prev = GetPrevInFlow(); prev; prev = prev->GetPrevInFlow()) { for (nsIFrame* prev = GetPrevInFlow(); prev; prev = prev->GetPrevInFlow()) {
height += prev->GetRect().height; height += prev->GetContentRectRelativeToSelf().height;
} }
return height; return height;
} }
@ -234,16 +231,8 @@ nsSplittableFrame::GetEffectiveComputedHeight(const nsHTMLReflowState& aReflowSt
height -= aConsumedHeight; height -= aConsumedHeight;
if (aConsumedHeight != 0 && aConsumedHeight != NS_INTRINSICSIZE) {
// We just subtracted our top-border padding, since it was included in the
// first frame's height. Add it back to get the content height.
height += aReflowState.ComputedPhysicalBorderPadding().top;
}
// We may have stretched the frame beyond its computed height. Oh well. // We may have stretched the frame beyond its computed height. Oh well.
height = std::max(0, height); return std::max(0, height);
return height;
} }
int int
@ -271,7 +260,8 @@ nsSplittableFrame::GetLogicalSkipSides(const nsHTMLReflowState* aReflowState) co
if (NS_UNCONSTRAINEDSIZE != aReflowState->AvailableHeight()) { if (NS_UNCONSTRAINEDSIZE != aReflowState->AvailableHeight()) {
nscoord effectiveCH = this->GetEffectiveComputedHeight(*aReflowState); nscoord effectiveCH = this->GetEffectiveComputedHeight(*aReflowState);
if (effectiveCH > aReflowState->AvailableHeight()) { if (effectiveCH != NS_INTRINSICSIZE &&
effectiveCH > aReflowState->AvailableHeight()) {
// Our content height is going to exceed our available height, so we're // Our content height is going to exceed our available height, so we're
// going to need a next-in-flow. // going to need a next-in-flow.
skip |= LOGICAL_SIDE_B_END; skip |= LOGICAL_SIDE_B_END;