From 1c44bf00e2a16b159fb39eae914d64de5e3bbcd2 Mon Sep 17 00:00:00 2001 From: Mats Palmgren Date: Tue, 16 Jun 2015 11:21:04 +0000 Subject: [PATCH] Bug 1174450 part 9 - Remove the nsRenderingContext* param from Intrinsic*SizeOffsets methods since it's unused. r=jfkthame --- layout/base/nsLayoutUtils.cpp | 3 +-- layout/generic/nsFrame.cpp | 21 +++++++++------------ layout/generic/nsFrame.h | 3 +-- layout/generic/nsIFrame.h | 6 ++---- layout/tables/BasicTableLayoutStrategy.cpp | 2 +- layout/tables/FixedTableLayoutStrategy.cpp | 2 +- layout/tables/nsTableCellFrame.cpp | 5 ++--- layout/tables/nsTableCellFrame.h | 3 +-- layout/tables/nsTableFrame.cpp | 5 ++--- layout/tables/nsTableFrame.h | 3 +-- 10 files changed, 21 insertions(+), 32 deletions(-) diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp index 8f17744b34b..2f6a02cf57a 100644 --- a/layout/base/nsLayoutUtils.cpp +++ b/layout/base/nsLayoutUtils.cpp @@ -4650,8 +4650,7 @@ nsLayoutUtils::IntrinsicForWM(WritingMode aWM, min = aFrame->GetMinISize(aRenderingContext); } - nsIFrame::IntrinsicISizeOffsetData offsets = - aFrame->IntrinsicISizeOffsets(aRenderingContext); + nsIFrame::IntrinsicISizeOffsetData offsets = aFrame->IntrinsicISizeOffsets(); result = AddIntrinsicSizeOffset(aRenderingContext, aFrame, offsets, aType, boxSizing, result, min, styleISize, haveFixedMinISize ? &minISize : nullptr, diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp index fa33b7c1a98..517fe1c1a80 100644 --- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsFrame.cpp @@ -4055,7 +4055,6 @@ nsIFrame::InlinePrefISizeData::ForceBreak(nsRenderingContext *aRenderingContext) static void AddCoord(const nsStyleCoord& aStyle, - nsRenderingContext* aRenderingContext, nsIFrame* aFrame, nscoord* aCoord, float* aPercent, bool aClampNegativeToZero) @@ -4092,9 +4091,7 @@ AddCoord(const nsStyleCoord& aStyle, } static nsIFrame::IntrinsicISizeOffsetData -IntrinsicSizeOffsets(nsIFrame* aFrame, - nsRenderingContext* aRenderingContext, - bool aForISize) +IntrinsicSizeOffsets(nsIFrame* aFrame, bool aForISize) { nsIFrame::IntrinsicISizeOffsetData result; WritingMode wm = aFrame->GetWritingMode(); @@ -4102,21 +4099,21 @@ IntrinsicSizeOffsets(nsIFrame* aFrame, bool orthogonal = aForISize == wm.IsVertical(); AddCoord(orthogonal ? styleMargin->mMargin.GetTop() : styleMargin->mMargin.GetLeft(), - aRenderingContext, aFrame, &result.hMargin, &result.hPctMargin, + aFrame, &result.hMargin, &result.hPctMargin, false); AddCoord(orthogonal ? styleMargin->mMargin.GetBottom() : styleMargin->mMargin.GetRight(), - aRenderingContext, aFrame, &result.hMargin, &result.hPctMargin, + aFrame, &result.hMargin, &result.hPctMargin, false); const nsStylePadding* stylePadding = aFrame->StylePadding(); AddCoord(orthogonal ? stylePadding->mPadding.GetTop() : stylePadding->mPadding.GetLeft(), - aRenderingContext, aFrame, &result.hPadding, &result.hPctPadding, + aFrame, &result.hPadding, &result.hPctPadding, true); AddCoord(orthogonal ? stylePadding->mPadding.GetBottom() : stylePadding->mPadding.GetRight(), - aRenderingContext, aFrame, &result.hPadding, &result.hPctPadding, + aFrame, &result.hPadding, &result.hPctPadding, true); if (aForISize) { @@ -4160,15 +4157,15 @@ IntrinsicSizeOffsets(nsIFrame* aFrame, } /* virtual */ nsIFrame::IntrinsicISizeOffsetData -nsFrame::IntrinsicISizeOffsets(nsRenderingContext* aRC) +nsFrame::IntrinsicISizeOffsets() { - return IntrinsicSizeOffsets(this, aRC, true); + return IntrinsicSizeOffsets(this, true); } nsIFrame::IntrinsicISizeOffsetData -nsIFrame::IntrinsicBSizeOffsets(nsRenderingContext* aRC) +nsIFrame::IntrinsicBSizeOffsets() { - return IntrinsicSizeOffsets(this, aRC, false); + return IntrinsicSizeOffsets(this, false); } /* virtual */ IntrinsicSize diff --git a/layout/generic/nsFrame.h b/layout/generic/nsFrame.h index 1b3a54e29e2..c405182e69e 100644 --- a/layout/generic/nsFrame.h +++ b/layout/generic/nsFrame.h @@ -250,8 +250,7 @@ public: InlineMinISizeData *aData) override; virtual void AddInlinePrefISize(nsRenderingContext *aRenderingContext, InlinePrefISizeData *aData) override; - virtual IntrinsicISizeOffsetData - IntrinsicISizeOffsets(nsRenderingContext* aRenderingContext) override; + virtual IntrinsicISizeOffsetData IntrinsicISizeOffsets() override; virtual mozilla::IntrinsicSize GetIntrinsicSize() override; virtual nsSize GetIntrinsicRatio() override; diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h index cce5fc3bba3..e687c9952ff 100644 --- a/layout/generic/nsIFrame.h +++ b/layout/generic/nsIFrame.h @@ -1648,15 +1648,13 @@ public: , hPctPadding(0.0f), hPctMargin(0.0f) {} }; - virtual IntrinsicISizeOffsetData - IntrinsicISizeOffsets(nsRenderingContext* aRenderingContext) = 0; + virtual IntrinsicISizeOffsetData IntrinsicISizeOffsets() = 0; /** * Return the bsize components of padding, border, and margin * that contribute to the intrinsic width that applies to the parent. */ - IntrinsicISizeOffsetData - IntrinsicBSizeOffsets(nsRenderingContext* aRenderingContext); + IntrinsicISizeOffsetData IntrinsicBSizeOffsets(); virtual mozilla::IntrinsicSize GetIntrinsicSize() = 0; diff --git a/layout/tables/BasicTableLayoutStrategy.cpp b/layout/tables/BasicTableLayoutStrategy.cpp index bd808034efb..1c18770a97f 100644 --- a/layout/tables/BasicTableLayoutStrategy.cpp +++ b/layout/tables/BasicTableLayoutStrategy.cpp @@ -104,7 +104,7 @@ GetWidthInfo(nsRenderingContext *aRenderingContext, // outer edges near the end of this function. // XXX Should we ignore percentage padding? - nsIFrame::IntrinsicISizeOffsetData offsets = aFrame->IntrinsicISizeOffsets(aRenderingContext); + nsIFrame::IntrinsicISizeOffsetData offsets = aFrame->IntrinsicISizeOffsets(); // In quirks mode, table cell width should be content-box, // but height should be border box. diff --git a/layout/tables/FixedTableLayoutStrategy.cpp b/layout/tables/FixedTableLayoutStrategy.cpp index 8a929fc3356..dbb93134dc3 100644 --- a/layout/tables/FixedTableLayoutStrategy.cpp +++ b/layout/tables/FixedTableLayoutStrategy.cpp @@ -248,7 +248,7 @@ FixedTableLayoutStrategy::ComputeColumnISizes(const nsHTMLReflowState& aReflowSt } else if (styleWidth->GetUnit() == eStyleUnit_Percent) { // XXX This should use real percentage padding nsIFrame::IntrinsicISizeOffsetData offsets = - cellFrame->IntrinsicISizeOffsets(aReflowState.rendContext); + cellFrame->IntrinsicISizeOffsets(); float pct = styleWidth->GetPercentValue(); colWidth = NSToCoordFloor(pct * float(tableWidth)); diff --git a/layout/tables/nsTableCellFrame.cpp b/layout/tables/nsTableCellFrame.cpp index e71edf1cc5d..d260435e685 100644 --- a/layout/tables/nsTableCellFrame.cpp +++ b/layout/tables/nsTableCellFrame.cpp @@ -788,10 +788,9 @@ nsTableCellFrame::GetPrefISize(nsRenderingContext *aRenderingContext) } /* virtual */ nsIFrame::IntrinsicISizeOffsetData -nsTableCellFrame::IntrinsicISizeOffsets(nsRenderingContext* aRenderingContext) +nsTableCellFrame::IntrinsicISizeOffsets() { - IntrinsicISizeOffsetData result = - nsContainerFrame::IntrinsicISizeOffsets(aRenderingContext); + IntrinsicISizeOffsetData result = nsContainerFrame::IntrinsicISizeOffsets(); result.hMargin = 0; result.hPctMargin = 0; diff --git a/layout/tables/nsTableCellFrame.h b/layout/tables/nsTableCellFrame.h index f20f61d725d..23473e82e66 100644 --- a/layout/tables/nsTableCellFrame.h +++ b/layout/tables/nsTableCellFrame.h @@ -117,8 +117,7 @@ public: virtual nscoord GetMinISize(nsRenderingContext *aRenderingContext) override; virtual nscoord GetPrefISize(nsRenderingContext *aRenderingContext) override; - virtual IntrinsicISizeOffsetData - IntrinsicISizeOffsets(nsRenderingContext* aRenderingContext) override; + virtual IntrinsicISizeOffsetData IntrinsicISizeOffsets() override; virtual void Reflow(nsPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, diff --git a/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp index 1b4077cbc10..9523505a84d 100644 --- a/layout/tables/nsTableFrame.cpp +++ b/layout/tables/nsTableFrame.cpp @@ -1542,10 +1542,9 @@ nsTableFrame::GetPrefISize(nsRenderingContext *aRenderingContext) } /* virtual */ nsIFrame::IntrinsicISizeOffsetData -nsTableFrame::IntrinsicISizeOffsets(nsRenderingContext* aRenderingContext) +nsTableFrame::IntrinsicISizeOffsets() { - IntrinsicISizeOffsetData result = - nsContainerFrame::IntrinsicISizeOffsets(aRenderingContext); + IntrinsicISizeOffsetData result = nsContainerFrame::IntrinsicISizeOffsets(); result.hMargin = 0; result.hPctMargin = 0; diff --git a/layout/tables/nsTableFrame.h b/layout/tables/nsTableFrame.h index 93071f3613b..0f997a25e88 100644 --- a/layout/tables/nsTableFrame.h +++ b/layout/tables/nsTableFrame.h @@ -319,8 +319,7 @@ public: // border to the results of these functions. virtual nscoord GetMinISize(nsRenderingContext *aRenderingContext) override; virtual nscoord GetPrefISize(nsRenderingContext *aRenderingContext) override; - virtual IntrinsicISizeOffsetData - IntrinsicISizeOffsets(nsRenderingContext* aRenderingContext) override; + virtual IntrinsicISizeOffsetData IntrinsicISizeOffsets() override; virtual mozilla::LogicalSize ComputeSize(nsRenderingContext *aRenderingContext,