Fixed a problem with mY not being updated properly for a bottom

margin

layout/generic/nsBlockFrame.cpp

@@ -548,7 +548,7 @@ nsBlockFrame::PlaceLine(nsBlockReflowState&     aState,
       aState.mPrevMaxNegBottomMargin;
     if (0 != bottomMargin) {
       aLine->MoveLineBy(0, bottomMargin);
-      aState.mY += topMargin;
+      aState.mY += bottomMargin;
     }
   }
 

layout/generic/nsBlockReflowState.cpp

@@ -548,7 +548,7 @@ nsBlockFrame::PlaceLine(nsBlockReflowState&     aState,
       aState.mPrevMaxNegBottomMargin;
     if (0 != bottomMargin) {
       aLine->MoveLineBy(0, bottomMargin);
-      aState.mY += topMargin;
+      aState.mY += bottomMargin;
     }
   }
 

layout/generic/nsBlockReflowState.h

@@ -548,7 +548,7 @@ nsBlockFrame::PlaceLine(nsBlockReflowState&     aState,
       aState.mPrevMaxNegBottomMargin;
     if (0 != bottomMargin) {
       aLine->MoveLineBy(0, bottomMargin);
-      aState.mY += topMargin;
+      aState.mY += bottomMargin;
     }
   }
 

layout/html/base/src/nsBlockFrame.cpp

@@ -548,7 +548,7 @@ nsBlockFrame::PlaceLine(nsBlockReflowState&     aState,
       aState.mPrevMaxNegBottomMargin;
     if (0 != bottomMargin) {
       aLine->MoveLineBy(0, bottomMargin);
-      aState.mY += topMargin;
+      aState.mY += bottomMargin;
     }
   }
 

layout/html/base/src/nsBlockReflowState.cpp

@@ -548,7 +548,7 @@ nsBlockFrame::PlaceLine(nsBlockReflowState&     aState,
       aState.mPrevMaxNegBottomMargin;
     if (0 != bottomMargin) {
       aLine->MoveLineBy(0, bottomMargin);
-      aState.mY += topMargin;
+      aState.mY += bottomMargin;
     }
   }
 

layout/html/base/src/nsBlockReflowState.h

@@ -548,7 +548,7 @@ nsBlockFrame::PlaceLine(nsBlockReflowState&     aState,
       aState.mPrevMaxNegBottomMargin;
     if (0 != bottomMargin) {
       aLine->MoveLineBy(0, bottomMargin);
-      aState.mY += topMargin;
+      aState.mY += bottomMargin;
     }
   }