Add in border and padding to get the max-element-size right

layout/generic/nsLeafFrame.cpp

@@ -71,6 +71,7 @@ nsLeafFrame::Reflow(nsIPresContext& aPresContext,
   nsMargin borderPadding;
   AddBordersAndPadding(&aPresContext, aReflowState, aMetrics, borderPadding);
   if (nsnull != aMetrics.maxElementSize) {
+    aMetrics.AddBorderPaddingToMaxElementSize(borderPadding);
     aMetrics.maxElementSize->width = aMetrics.width;
     aMetrics.maxElementSize->height = aMetrics.height;
   }

layout/html/base/src/nsLeafFrame.cpp

@@ -71,6 +71,7 @@ nsLeafFrame::Reflow(nsIPresContext& aPresContext,
   nsMargin borderPadding;
   AddBordersAndPadding(&aPresContext, aReflowState, aMetrics, borderPadding);
   if (nsnull != aMetrics.maxElementSize) {
+    aMetrics.AddBorderPaddingToMaxElementSize(borderPadding);
     aMetrics.maxElementSize->width = aMetrics.width;
     aMetrics.maxElementSize->height = aMetrics.height;
   }