Backing out bug 421436 due to regression bug 439462

layout/forms/nsTextControlFrame.cpp

@@ -1335,7 +1335,13 @@ nsTextControlFrame::CalcIntrinsicSize(nsIRenderingContext* aRenderingContext,
     // Now add the extra padding on (so that small input sizes work well)
     aIntrinsicSize.width += internalPadding;
   } else {
-    // Add in the padding of our anonymous div child.  Note that it hasn't
+    // 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;
+    }
+
+    // Also add in the padding of our anonymous div child.  Note that it hasn't
     // been reflowed yet, so we can't get its used padding, but it shouldn't be
     // using percentage padding anyway.
     nsMargin childPadding;

layout/generic/nsBRFrame.cpp

@@ -159,6 +159,14 @@ BRFrame::Reflow(nsPresContext* aPresContext,
       else {
         aMetrics.ascent = aMetrics.height = 0;
       }
+
+      // XXX temporary until I figure out a better solution; see the
+      // code in nsLineLayout::VerticalAlignFrames that zaps minY/maxY
+      // if the width is zero.
+      // XXX This also fixes bug 10036!
+      // Warning: nsTextControlFrame::CalculateSizeStandard depends on
+      // the following line, see bug 228752.
+      aMetrics.width = 1;
     }
 
     // Return our reflow status

layout/generic/test/test_bug421436.html

@@ -24,7 +24,7 @@ var inner = document.getElementById("inner");
 var outer = document.getElementById("outer");
 
 is(inner.getBoundingClientRect().left, outer.getBoundingClientRect().left);
-is(inner.getBoundingClientRect().right, outer.getBoundingClientRect().right);
+todo(inner.getBoundingClientRect().right, outer.getBoundingClientRect().right);
 
 </script>
 </pre>