Bug 941916: Drop unused constructor param "aItems" from SingleLineCrossAxisPositionTracker constructor. r=mats
authorDaniel Holbert <dholbert@cs.stanford.edu>
Thu, 21 Nov 2013 22:50:47 -0800
changeset 157372 9a179f9b33ca9fc2c3820405483573c1dcf1a72f
parent 157371 778fa6c5970d742ed4fe46df49e8e104b090600a
child 157373 1da0b2521da2b258b2a98dbe77df2ac681f49676
child 157464 91bb324e338543feefedd8fa9e1d7feba996f1bc
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
reviewersmats
bugs941916
milestone28.0a1
Bug 941916: Drop unused constructor param "aItems" from SingleLineCrossAxisPositionTracker constructor. r=mats
layout/generic/nsFlexContainerFrame.cpp
--- a/layout/generic/nsFlexContainerFrame.cpp
+++ b/layout/generic/nsFlexContainerFrame.cpp
@@ -1090,18 +1090,17 @@ public:
   // SingleLineCrossAxisPositionTracker::SetLineCrossSize().
 };
 
 // Utility class for managing our position along the cross axis, *within* a
 // single flex line.
 class MOZ_STACK_CLASS SingleLineCrossAxisPositionTracker : public PositionTracker {
 public:
   SingleLineCrossAxisPositionTracker(nsFlexContainerFrame* aFlexContainerFrame,
-                                     const FlexboxAxisTracker& aAxisTracker,
-                                     const nsTArray<FlexItem>& aItems);
+                                     const FlexboxAxisTracker& aAxisTracker);
 
   void ComputeLineCrossSize(const nsTArray<FlexItem>& aItems);
   inline nscoord GetLineCrossSize() const { return mLineCrossSize; }
 
   // Used to override the flex line's size, for cases when the flex container is
   // single-line and has a fixed size, and also in cases where
   // "align-self: stretch" triggers some space-distribution between lines
   // (when we support that property).
@@ -1677,18 +1676,17 @@ MainAxisPositionTracker::TraversePacking
     mPosition += curPackingSpace;
     mNumPackingSpacesRemaining--;
     mPackingSpaceRemaining -= curPackingSpace;
   }
 }
 
 SingleLineCrossAxisPositionTracker::
   SingleLineCrossAxisPositionTracker(nsFlexContainerFrame* aFlexContainerFrame,
-                                     const FlexboxAxisTracker& aAxisTracker,
-                                     const nsTArray<FlexItem>& aItems)
+                                     const FlexboxAxisTracker& aAxisTracker)
   : PositionTracker(aAxisTracker.GetCrossAxis()),
     mLineCrossSize(0),
     mCrossStartToFurthestBaseline(nscoord_MIN) // Starts at -infinity, and then
                                                // we progressively increase it.
 {
 }
 
 void
@@ -2367,17 +2365,17 @@ nsFlexContainerFrame::Reflow(nsPresConte
   // Set up state for cross-axis alignment, at a high level (outside the
   // scope of a particular flex line)
   CrossAxisPositionTracker
     crossAxisPosnTracker(this, axisTracker, aReflowState);
 
   // Set up state for cross-axis-positioning of children _within_ a single
   // flex line.
   SingleLineCrossAxisPositionTracker
-    lineCrossAxisPosnTracker(this, axisTracker, items);
+    lineCrossAxisPosnTracker(this, axisTracker);
 
   lineCrossAxisPosnTracker.ComputeLineCrossSize(items);
   // XXXdholbert Once we've got multi-line flexbox support: here, after we've
   // computed the cross size of all lines, we need to check if if
   // 'align-content' is 'stretch' -- if it is, we need to give each line an
   // additional share of our flex container's desired cross-size. (if it's
   // not NS_AUTOHEIGHT and there's any cross-size left over to distribute)
   bool isCrossSizeDefinite;