summaryrefslogtreecommitdiffstats
path: root/layout/mathml/nsMathMLContainerFrame.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'layout/mathml/nsMathMLContainerFrame.cpp')
-rw-r--r--layout/mathml/nsMathMLContainerFrame.cpp22
1 files changed, 8 insertions, 14 deletions
diff --git a/layout/mathml/nsMathMLContainerFrame.cpp b/layout/mathml/nsMathMLContainerFrame.cpp
index b63792c288..fc334d1cae 100644
--- a/layout/mathml/nsMathMLContainerFrame.cpp
+++ b/layout/mathml/nsMathMLContainerFrame.cpp
@@ -829,39 +829,33 @@ static nscoord AddInterFrameSpacingToSize(ReflowOutput& aDesiredSize,
/* virtual */
void nsMathMLContainerFrame::MarkIntrinsicISizesDirty() {
- mIntrinsicWidth = NS_INTRINSIC_ISIZE_UNKNOWN;
+ mIntrinsicISize = NS_INTRINSIC_ISIZE_UNKNOWN;
nsContainerFrame::MarkIntrinsicISizesDirty();
}
-void nsMathMLContainerFrame::UpdateIntrinsicWidth(
+void nsMathMLContainerFrame::UpdateIntrinsicISize(
gfxContext* aRenderingContext) {
- if (mIntrinsicWidth == NS_INTRINSIC_ISIZE_UNKNOWN) {
+ if (mIntrinsicISize == NS_INTRINSIC_ISIZE_UNKNOWN) {
ReflowOutput desiredSize(GetWritingMode());
GetIntrinsicISizeMetrics(aRenderingContext, desiredSize);
// Include the additional width added by FixInterFrameSpacing to ensure
// consistent width calculations.
AddInterFrameSpacingToSize(desiredSize, this);
- mIntrinsicWidth = desiredSize.ISize(GetWritingMode());
+ mIntrinsicISize = desiredSize.ISize(GetWritingMode());
}
}
/* virtual */
nscoord nsMathMLContainerFrame::GetMinISize(gfxContext* aRenderingContext) {
- nscoord result;
- DISPLAY_MIN_INLINE_SIZE(this, result);
- UpdateIntrinsicWidth(aRenderingContext);
- result = mIntrinsicWidth;
- return result;
+ UpdateIntrinsicISize(aRenderingContext);
+ return mIntrinsicISize;
}
/* virtual */
nscoord nsMathMLContainerFrame::GetPrefISize(gfxContext* aRenderingContext) {
- nscoord result;
- DISPLAY_PREF_INLINE_SIZE(this, result);
- UpdateIntrinsicWidth(aRenderingContext);
- result = mIntrinsicWidth;
- return result;
+ UpdateIntrinsicISize(aRenderingContext);
+ return mIntrinsicISize;
}
/* virtual */