Bug 898797 - Use nsHTMLReflowState::ApplyRelativePositioning when placing floats. r=dbaron

2013-07-29 21:53:13 -07:00
parent 86af04729e
commit 1fb438ac39
3 changed files with 11 additions and 6 deletions
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -5740,6 +5740,7 @@ nsBlockFrame::ReflowFloat(nsBlockReflowState& aState,
                          const nsRect&       aAdjustedAvailableSpace,
                          nsIFrame*           aFloat,
                          nsMargin&           aFloatMargin,
+                          nsMargin&           aFloatOffsets,
                          bool                aFloatPushedDown,
                          nsReflowStatus&     aReflowStatus)
 {
@@ -5830,8 +5831,9 @@ nsBlockFrame::ReflowFloat(nsBlockReflowState& aState,
    return rv;
  }

-  // Capture the margin information for the caller
+  // Capture the margin and offsets information for the caller
  aFloatMargin = floatRS.mComputedMargin; // float margins don't collapse
+  aFloatOffsets = floatRS.mComputedOffsets;

  const nsHTMLReflowMetrics& metrics = brc.GetMetrics();