Bug 946269: Rename nsFlexContainerFrame::ComputeFlexContainerCrossSize to ComputeCrossSize. implicit-rs=mats
authorDaniel Holbert <dholbert@cs.stanford.edu>
Fri, 06 Dec 2013 13:38:49 -0800
changeset 174984 6cc28fece8bfb6595c022ba995f92fc543b8d924
parent 174983 16628db76c3c6522471e998c9ef4ec49203ec80e
child 174985 5fda7fbcc45b718b312486ea948e3faa0a70c90d
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs946269
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 946269: Rename nsFlexContainerFrame::ComputeFlexContainerCrossSize to ComputeCrossSize. implicit-rs=mats
layout/generic/nsFlexContainerFrame.cpp
layout/generic/nsFlexContainerFrame.h
--- a/layout/generic/nsFlexContainerFrame.cpp
+++ b/layout/generic/nsFlexContainerFrame.cpp
@@ -2347,23 +2347,22 @@ SumLineCrossSizes(const nsTArray<FlexLin
   nscoord sum = 0;
   for (uint32_t lineIdx = 0; lineIdx < aLines.Length(); lineIdx++) {
     sum += aLines[lineIdx].GetLineCrossSize();
   }
   return sum;
 }
 
 nscoord
-nsFlexContainerFrame::ComputeFlexContainerCrossSize(
-  const nsHTMLReflowState& aReflowState,
-  const FlexboxAxisTracker& aAxisTracker,
-  const nsTArray<FlexLine>& aLines,
-  nscoord aAvailableHeightForContent,
-  bool* aIsDefinite,
-  nsReflowStatus& aStatus)
+nsFlexContainerFrame::ComputeCrossSize(const nsHTMLReflowState& aReflowState,
+                                       const FlexboxAxisTracker& aAxisTracker,
+                                       const nsTArray<FlexLine>& aLines,
+                                       nscoord aAvailableHeightForContent,
+                                       bool* aIsDefinite,
+                                       nsReflowStatus& aStatus)
 {
   MOZ_ASSERT(aIsDefinite, "outparam pointer must be non-null"); 
 
   if (IsAxisHorizontal(aAxisTracker.GetCrossAxis())) {
     // Cross axis is horizontal: our cross size is our computed width
     // (which is already resolved).
     *aIsDefinite = true;
     return aReflowState.ComputedWidth();
@@ -2686,20 +2685,18 @@ nsFlexContainerFrame::Reflow(nsPresConte
   // Calculate the cross size and (if necessary) baseline-alignment position
   // for each of our flex lines:
   for (uint32_t lineIdx = 0; lineIdx < lines.Length(); ++lineIdx) {
     lines[lineIdx].ComputeCrossSizeAndBaseline(axisTracker);
   }
 
   bool isCrossSizeDefinite;
   const nscoord contentBoxCrossSize =
-    ComputeFlexContainerCrossSize(aReflowState, axisTracker,
-                                  lines,
-                                  availableHeightForContent,
-                                  &isCrossSizeDefinite, aStatus);
+    ComputeCrossSize(aReflowState, axisTracker, lines,
+                     availableHeightForContent, &isCrossSizeDefinite, aStatus);
 
   // Set up state for cross-axis alignment, at a high level (outside the
   // scope of a particular flex line)
   CrossAxisPositionTracker
     crossAxisPosnTracker(lines, aReflowState.mStylePosition->mAlignContent,
                          contentBoxCrossSize, isCrossSizeDefinite, axisTracker);
 
   // Set the flex container's baseline, from the baseline-alignment position
--- a/layout/generic/nsFlexContainerFrame.h
+++ b/layout/generic/nsFlexContainerFrame.h
@@ -99,22 +99,22 @@ protected:
                              nscoord aContentBoxMainSize,
                              nscoord aAvailableHeightForContent,
                              const FlexboxAxisTracker& aAxisTracker,
                              nsTArray<FlexLine>& aLines);
 
   nscoord GetMainSizeFromReflowState(const nsHTMLReflowState& aReflowState,
                                      const FlexboxAxisTracker& aAxisTracker);
 
-  nscoord ComputeFlexContainerCrossSize(const nsHTMLReflowState& aReflowState,
-                                        const FlexboxAxisTracker& aAxisTracker,
-                                        const nsTArray<FlexLine>& aLines,
-                                        nscoord aAvailableHeightForContent,
-                                        bool* aIsDefinite,
-                                        nsReflowStatus& aStatus);
+  nscoord ComputeCrossSize(const nsHTMLReflowState& aReflowState,
+                           const FlexboxAxisTracker& aAxisTracker,
+                           const nsTArray<FlexLine>& aLines,
+                           nscoord aAvailableHeightForContent,
+                           bool* aIsDefinite,
+                           nsReflowStatus& aStatus);
 
   nsresult SizeItemInCrossAxis(nsPresContext* aPresContext,
                                const FlexboxAxisTracker& aAxisTracker,
                                nsHTMLReflowState& aChildReflowState,
                                FlexItem& aItem);
 
   bool mChildrenHaveBeenReordered; // Have we ever had to reorder our kids
                                    // to satisfy their 'order' values?