address dbaron review comment: Add FIXME to removeme-after-DLBI-lands comments
authorDaniel Holbert <dholbert@cs.stanford.edu>
Tue, 18 Sep 2012 15:45:33 -0700
changeset 1802 3a025cdc3a77ce92d1a2aa3c002d98209f19d109
parent 1801 32887919ea389d78c9d2133cca62de1fd98ba8cd
child 1803 1269251e40216bba1e886563779414a47bcf6716
push id1475
push userdholbert@mozilla.com
push dateTue, 18 Sep 2012 22:45:34 +0000
address dbaron review comment: Add FIXME to removeme-after-DLBI-lands comments
flexbox-mainImpl.patch
--- a/flexbox-mainImpl.patch
+++ b/flexbox-mainImpl.patch
@@ -1850,18 +1850,18 @@ diff --git a/layout/generic/nsFlexContai
 +
 +nsresult
 +nsFlexContainerFrame::SizeItemInCrossAxis(
 +  nsPresContext* aPresContext,
 +  const FlexboxAxisTracker& aAxisTracker,
 +  const nsHTMLReflowState& aChildReflowState,
 +  FlexItem& aItem)
 +{
-+  // Invalidate child's old overflow rect (greedy; once the
-+  // display-list-based invalidation patches have landed, this can go away.)
++  // Invalidate child's old overflow rect (greedy)
++  // FIXME: remove once the DLBI patches have landed (bug 539356)
 +  aItem.Frame()->InvalidateOverflowRect();
 +
 +  nsHTMLReflowMetrics childDesiredSize;
 +  nsReflowStatus childReflowStatus;
 +  nsresult rv = ReflowChild(aItem.Frame(), aPresContext,
 +                            childDesiredSize, aChildReflowState,
 +                            0, 0, NS_FRAME_NO_MOVE_FRAME,
 +                            childReflowStatus);
@@ -2146,18 +2146,18 @@ diff --git a/layout/generic/nsFlexContai
 +        physicalPosn.y += childReflowState.mComputedOffsets.top;
 +      }
 +
 +      rv = FinishReflowChild(curItem.Frame(), aPresContext,
 +                             &childReflowState, childDesiredSize,
 +                             physicalPosn.x, physicalPosn.y, 0);
 +      NS_ENSURE_SUCCESS(rv, rv);
 +
-+      // Invalidate child's new overflow rect (greedy; once the
-+      // display-list-based invalidation patches have landed, this can go away.)
++      // Invalidate child's new overflow rect (greedy)
++      // FIXME: remove once the DLBI patches have landed (bug 539356)
 +      curItem.Frame()->InvalidateOverflowRect();
 +    }
 +  }
 +
 +  // XXXdholbert This could be more elegant
 +  aDesiredSize.width =
 +    IsAxisHorizontal(axisTracker.GetMainAxis()) ?
 +    frameMainSize : frameCrossSize;