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

Backed out changeset 9b0b2391485c due to linker errors related to nsStyleStructInlines.h not being included enough.

Browse Source
This commit is contained in:
L. David Baron
2008-07-16 22:59:14 -07:00
parent 97a13b7ef1
commit f51a50d4ed
73 changed files with 125 additions and 1993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
layout/generic/nsBlockFrame.cpp
View File

@@ -796,7 +796,7 @@ CalculateContainingBlockSizeForAbsolutes(const nsHTMLReflowState& aReflowState,
nsSize cbSize(aFrameSize);
// Containing block is relative to the padding edge
const nsMargin& border = aReflowState.mStyleBorder->GetActualBorder();
const nsMargin& border = aReflowState.mStyleBorder->GetBorder();
cbSize.width -= border.left + border.right;
cbSize.height -= border.top + border.bottom;
@@ -2650,8 +2650,8 @@ nsBlockFrame::IsSelfEmpty()
const nsStyleBorder* border = GetStyleBorder();
const nsStylePadding* padding = GetStylePadding();
if (border->GetActualBorderWidth(NS_SIDE_TOP) != 0 ||
border->GetActualBorderWidth(NS_SIDE_BOTTOM) != 0 ||
if (border->GetBorderWidth(NS_SIDE_TOP) != 0 ||
border->GetBorderWidth(NS_SIDE_BOTTOM) != 0 ||
!IsPaddingZero(padding->mPadding.GetTopUnit(),
padding->mPadding.GetTop()) ||
!IsPaddingZero(padding->mPadding.GetBottomUnit(),