backout c3f1ab75ea51 (bug 421436) for regressing bug 439462

This commit is contained in:
Daniel Holbert
2014-05-22 15:10:20 -07:00
parent 80657e1928
commit e5ada5f1f7
6 changed files with 20 additions and 3 deletions

View File

@@ -184,6 +184,12 @@ nsTextControlFrame::CalcIntrinsicSize(nsRenderingContext* aRenderingContext,
}
// Now add the extra padding on (so that small input sizes work well)
aIntrinsicSize.width += internalPadding;
} else {
// This is to account for the anonymous <br> having a 1 twip width
// in Full Standards mode, see BRFrame::Reflow and bug 228752.
if (PresContext()->CompatibilityMode() == eCompatibility_FullStandards) {
aIntrinsicSize.width += 1;
}
}
// Increment width with cols * letter-spacing.