Bug 139843. Back out width adjustment patch that breaks other things and may no longer be needed. r+sr+a=dbaron

This commit is contained in:
roc+@cs.cmu.edu 2007-09-17 19:54:48 -07:00
Родитель ce5b122a6e
Коммит 662617a914
1 изменённых файлов: 1 добавлений и 4 удалений

Просмотреть файл

@ -425,10 +425,6 @@ nsHTMLScrollFrame::ReflowScrolledFrame(const ScrollReflowState& aState,
mInner.mVScrollbarBox->GetPrefSize(const_cast<nsBoxLayoutState&>(aState.mBoxState)); mInner.mVScrollbarBox->GetPrefSize(const_cast<nsBoxLayoutState&>(aState.mBoxState));
availWidth = PR_MAX(0, availWidth - vScrollbarPrefSize.width); availWidth = PR_MAX(0, availWidth - vScrollbarPrefSize.width);
} }
// pixel align the content
nsPresContext* presContext = PresContext();
nscoord twp = nsPresContext::CSSPixelsToAppUnits(1);
availWidth -= availWidth % twp;
// We're forcing the padding on our scrolled frame, so let it know what that // We're forcing the padding on our scrolled frame, so let it know what that
// padding is. // padding is.
@ -437,6 +433,7 @@ nsHTMLScrollFrame::ReflowScrolledFrame(const ScrollReflowState& aState,
new nsMargin(aState.mReflowState.mComputedPadding), new nsMargin(aState.mReflowState.mComputedPadding),
nsCSSOffsetState::DestroyMarginFunc); nsCSSOffsetState::DestroyMarginFunc);
nsPresContext* presContext = PresContext();
// Pass PR_FALSE for aInit so we can pass in the correct padding // Pass PR_FALSE for aInit so we can pass in the correct padding
nsHTMLReflowState kidReflowState(presContext, aState.mReflowState, nsHTMLReflowState kidReflowState(presContext, aState.mReflowState,
mInner.mScrolledFrame, mInner.mScrolledFrame,