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

Replace AutoMaybeNullInflationContainer with AutoMaybeDisableInflationForShrinkWrap since the concept of the pres context's current inflation container will be going away. (Bug 747720, patch 2) r=roc

Browse Source
This commit is contained in:
L. David Baron
2012-05-20 22:18:27 -07:00
parent 8564a90e2c
commit 995ff8b9c1
10 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
layout/generic/nsHTMLReflowState.cpp
View File

@@ -1283,7 +1283,7 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsPresContext* aPresContext,
}
{
AutoMaybeNullInflationContainer an(frame);
AutoMaybeDisableFontInflation an(frame);
nsSize size =
frame->ComputeSize(rendContext,
@@ -1905,7 +1905,7 @@ nsHTMLReflowState::InitConstraints(nsPresContext* aPresContext,
InitAbsoluteConstraints(aPresContext, cbrs, aContainingBlockWidth,
aContainingBlockHeight, aFrameType);
} else {
AutoMaybeNullInflationContainer an(frame);
AutoMaybeDisableFontInflation an(frame);
bool isBlock = NS_CSS_FRAME_TYPE_BLOCK == NS_FRAME_GET_TYPE(mFrameType);
PRUint32 computeSizeFlags = isBlock ? 0 : nsIFrame::eShrinkWrap;