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

15
layout/generic/nsHTMLReflowState.cpp
View File

@@ -308,17 +308,6 @@ nsHTMLReflowState::Init(nsPresContext* aPresContext,
InitResizeFlags(aPresContext);
// We have to start loading the border image now, because the
// border-image's width overrides only apply once the image is loaded.
// Starting the load of the image means we'll get a reflow when the
// image loads. (If we didn't do it now, and the image loaded between
// reflow and paint, we'd never get the notification, and our size
// would be wrong.)
imgIRequest *borderImage = mStyleBorder->GetBorderImage();
if (borderImage) {
aPresContext->LoadBorderImage(borderImage, frame);
}
NS_ASSERTION((mFrameType == NS_CSS_FRAME_TYPE_INLINE &&
!frame->IsFrameOfType(nsIFrame::eReplaced)) ||
frame->GetType() == nsGkAtoms::textFrame ||
@@ -810,7 +799,7 @@ nsHTMLReflowState::CalculateHorizBorderPaddingMargin(
nscoord* aInsideBoxSizing,
nscoord* aOutsideBoxSizing)
{
const nsMargin& border = mStyleBorder->GetActualBorder();
const nsMargin& border = mStyleBorder->GetBorder();
nsMargin padding, margin;
// See if the style system can provide us the padding directly
@@ -1902,7 +1891,7 @@ nsCSSOffsetState::InitOffsets(nscoord aContainingBlockWidth,
mComputedBorderPadding = *aBorder;
}
else {
mComputedBorderPadding = frame->GetStyleBorder()->GetActualBorder();
mComputedBorderPadding = frame->GetStyleBorder()->GetBorder();
}
mComputedBorderPadding += mComputedPadding;