Fix border width inheritance by keeping track of both the border width we'd

have if our style were not none/hidden and the actual computed border width.
Bug 290377, r+sr=dbaron, a=asa


git-svn-id: svn://10.0.0.236/trunk@172872 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/layout/generic/nsBlockReflowState.cpp

@@ -258,9 +258,7 @@ nsBlockReflowState::ComputeBlockAvailSpace(nsIFrame* aFrame,
             styleMargin->GetMargin(m); // XXX percentage margins
             if (NS_STYLE_FLOAT_EDGE_PADDING == borderStyle->mFloatEdge) {
               // Add in border too
-              nsMargin b;
-              borderStyle->GetBorder(b);
-              m += b;
+              m += borderStyle->GetBorder();
             }
 
             // determine left edge