Bug 1025669 - part 2, some minor cleanup. r=roc
authorMats Palmgren <mats@mozilla.com>
Tue, 24 Jun 2014 17:52:19 +0000
changeset 190558 43f6ea484ca7d85cf44ded8b8e1a121c35fd0a27
parent 190557 ae2fd5b2defb0df1bd30521f4793de6757d1e98b
child 190559 f2b6b2e73a65ed2551e5f14382a8a3c377dc107d
push idunknown
push userunknown
push dateunknown
reviewersroc
bugs1025669
milestone33.0a1
Bug 1025669 - part 2, some minor cleanup. r=roc
layout/generic/nsBlockReflowState.cpp
--- a/layout/generic/nsBlockReflowState.cpp
+++ b/layout/generic/nsBlockReflowState.cpp
@@ -41,36 +41,33 @@ nsBlockReflowState::nsBlockReflowState(c
     mPrevBEndMargin(),
     mLineNumber(0),
     mFlags(0),
     mFloatBreakType(NS_STYLE_CLEAR_NONE),
     mConsumedBSize(aConsumedBSize)
 {
   WritingMode wm = aReflowState.GetWritingMode();
   SetFlag(BRS_ISFIRSTINFLOW, aFrame->GetPrevInFlow() == nullptr);
-  SetFlag(BRS_ISOVERFLOWCONTAINER,
-          IS_TRUE_OVERFLOW_CONTAINER(aFrame));
+  SetFlag(BRS_ISOVERFLOWCONTAINER, IS_TRUE_OVERFLOW_CONTAINER(aFrame));
 
   int logicalSkipSides = aFrame->GetLogicalSkipSides(&aReflowState);
   mBorderPadding.ApplySkipSides(logicalSkipSides);
 
   // Note that mContainerWidth is the physical width!
   mContainerWidth = aReflowState.ComputedWidth() + mBorderPadding.LeftRight(wm);
 
   if ((aBStartMarginRoot && !(logicalSkipSides & LOGICAL_SIDE_B_START)) ||
       0 != mBorderPadding.BStart(wm)) {
     SetFlag(BRS_ISBSTARTMARGINROOT, true);
+    SetFlag(BRS_APPLYBSTARTMARGIN, true);
   }
   if ((aBEndMarginRoot && !(logicalSkipSides & LOGICAL_SIDE_B_END)) ||
       0 != mBorderPadding.BEnd(wm)) {
     SetFlag(BRS_ISBENDMARGINROOT, true);
   }
-  if (GetFlag(BRS_ISBSTARTMARGINROOT)) {
-    SetFlag(BRS_APPLYBSTARTMARGIN, true);
-  }
   if (aBlockNeedsFloatManager) {
     SetFlag(BRS_FLOAT_MGR, true);
   }
   
   mFloatManager = aReflowState.mFloatManager;
 
   NS_ASSERTION(mFloatManager,
                "FloatManager should be set in nsBlockReflowState" );