diff --git a/layout/tables/BasicTableLayoutStrategy.cpp b/layout/tables/BasicTableLayoutStrategy.cpp index e5e822ffb575..1129f772d597 100644 --- a/layout/tables/BasicTableLayoutStrategy.cpp +++ b/layout/tables/BasicTableLayoutStrategy.cpp @@ -523,7 +523,7 @@ BasicTableLayoutStrategy::MarkIntrinsicISizesDirty() } /* virtual */ void -BasicTableLayoutStrategy::ComputeColumnWidths(const nsHTMLReflowState& aReflowState) +BasicTableLayoutStrategy::ComputeColumnISizes(const nsHTMLReflowState& aReflowState) { nscoord width = aReflowState.ComputedWidth(); @@ -549,7 +549,7 @@ BasicTableLayoutStrategy::ComputeColumnWidths(const nsHTMLReflowState& aReflowSt DistributeWidthToColumns(width, 0, colCount, BTLS_FINAL_WIDTH, false); #ifdef DEBUG_TABLE_STRATEGY - printf("ComputeColumnWidths final\n"); + printf("ComputeColumnISizes final\n"); mTableFrame->Dump(false, true, false); #endif } @@ -850,7 +850,7 @@ BasicTableLayoutStrategy::DistributeWidthToColumns(nscoord aWidth, } #ifdef DEBUG_dbaron_off - printf("ComputeColumnWidths: %d columns in width %d,\n" + printf("ComputeColumnISizes: %d columns in width %d,\n" " guesses=[%d,%d,%d,%d], totals=[%d,%d,%f],\n" " l2t=%d, space=%d, basis.c=%d\n", aColCount, aWidth, diff --git a/layout/tables/BasicTableLayoutStrategy.h b/layout/tables/BasicTableLayoutStrategy.h index 1b19ecb8ec87..7ed9a36a4fed 100644 --- a/layout/tables/BasicTableLayoutStrategy.h +++ b/layout/tables/BasicTableLayoutStrategy.h @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /* - * Web-compatible algorithms that determine column and table widths, + * Web-compatible algorithms that determine column and table isizes, * used for CSS2's 'table-layout: auto'. */ @@ -28,7 +28,7 @@ public: virtual nscoord GetPrefISize(nsRenderingContext* aRenderingContext, bool aComputingSize) override; virtual void MarkIntrinsicISizesDirty() override; - virtual void ComputeColumnWidths(const nsHTMLReflowState& aReflowState) override; + virtual void ComputeColumnISizes(const nsHTMLReflowState& aReflowState) override; private: // NOTE: Using prefix "BTLS" to avoid overlapping names with diff --git a/layout/tables/FixedTableLayoutStrategy.cpp b/layout/tables/FixedTableLayoutStrategy.cpp index 1f8837667050..2022d6582f51 100644 --- a/layout/tables/FixedTableLayoutStrategy.cpp +++ b/layout/tables/FixedTableLayoutStrategy.cpp @@ -151,7 +151,7 @@ AllocateUnassigned(nscoord aUnassignedSpace, float aShare) } /* virtual */ void -FixedTableLayoutStrategy::ComputeColumnWidths(const nsHTMLReflowState& aReflowState) +FixedTableLayoutStrategy::ComputeColumnISizes(const nsHTMLReflowState& aReflowState) { nscoord tableWidth = aReflowState.ComputedWidth(); @@ -173,7 +173,7 @@ FixedTableLayoutStrategy::ComputeColumnWidths(const nsHTMLReflowState& aReflowSt // store the old column widths. We might call multiple times SetFinalWidth // on the columns, due to this we can't compare at the last call that the // width has changed with the respect to the last call to - // ComputeColumnWidths. In order to overcome this we store the old values + // ComputeColumnISizes. In order to overcome this we store the old values // in this array. A single call to SetFinalWidth would make it possible to // call GetFinalWidth before and to compare when setting the final width. nsTArray oldColWidths; diff --git a/layout/tables/FixedTableLayoutStrategy.h b/layout/tables/FixedTableLayoutStrategy.h index 3468ae0d9aa8..7005106320b0 100644 --- a/layout/tables/FixedTableLayoutStrategy.h +++ b/layout/tables/FixedTableLayoutStrategy.h @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /* - * Algorithms that determine column and table widths used for CSS2's + * Algorithms that determine column and table isizes used for CSS2's * 'table-layout: fixed'. */ @@ -28,7 +28,7 @@ public: virtual nscoord GetPrefISize(nsRenderingContext* aRenderingContext, bool aComputingSize) override; virtual void MarkIntrinsicISizesDirty() override; - virtual void ComputeColumnWidths(const nsHTMLReflowState& aReflowState) override; + virtual void ComputeColumnISizes(const nsHTMLReflowState& aReflowState) override; private: nsTableFrame *mTableFrame; diff --git a/layout/tables/nsITableLayoutStrategy.h b/layout/tables/nsITableLayoutStrategy.h index 9972770b4c1d..e9ece83c41db 100644 --- a/layout/tables/nsITableLayoutStrategy.h +++ b/layout/tables/nsITableLayoutStrategy.h @@ -6,7 +6,7 @@ /* * interface for the set of algorithms that determine column and table - * widths + * isizes */ #ifndef nsITableLayoutStrategy_h_ @@ -34,10 +34,10 @@ public: virtual void MarkIntrinsicISizesDirty() = 0; /** - * Compute final column widths based on the intrinsic width data and - * the available width. + * Compute final column isizes based on the intrinsic isize data and + * the available isize. */ - virtual void ComputeColumnWidths(const nsHTMLReflowState& aReflowState) = 0; + virtual void ComputeColumnISizes(const nsHTMLReflowState& aReflowState) = 0; /** * Return the type of table layout strategy, without the cost of diff --git a/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp index 0a3db5d821a7..8b992ef89853 100644 --- a/layout/tables/nsTableFrame.cpp +++ b/layout/tables/nsTableFrame.cpp @@ -2028,7 +2028,7 @@ nsTableFrame::ReflowTable(nsHTMLReflowMetrics& aDesiredSize, aLastChildReflowed = nullptr; if (!GetPrevInFlow()) { - mTableLayoutStrategy->ComputeColumnWidths(aReflowState); + mTableLayoutStrategy->ComputeColumnISizes(aReflowState); } // Constrain our reflow width to the computed table width (of the 1st in flow). // and our reflow height to our avail height minus border, padding, cellspacing