Backed out ab701cac6af8.

2011-12-19 23:11:09 -06:00 · 2011-12-19 23:11:09 -06:00 · 9d7c9e00a9
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@ -4506,14 +4506,9 @@ MinimumFontSizeFor(nsPresContext* aPresContext, nscoord aContainerWidth)
  if (sFontSizeInflationEmPerLine == 0 && sFontSizeInflationMinTwips == 0) {
    return 0;
  }
-
-  // Clamp the container width to the device dimensions
-  nscoord iFrameWidth = aPresContext->GetVisibleArea().width;
-  nscoord effectiveContainerWidth = NS_MIN(iFrameWidth, aContainerWidth);
-
  nscoord byLine = 0, byInch = 0;
  if (sFontSizeInflationEmPerLine != 0) {
-    byLine = effectiveContainerWidth / sFontSizeInflationEmPerLine;
+    byLine = aContainerWidth / sFontSizeInflationEmPerLine;
  }
  if (sFontSizeInflationMinTwips != 0) {
    // REVIEW: Is this giving us app units and sizes *not* counting
@ -4523,7 +4518,7 @@ MinimumFontSizeFor(nsPresContext* aPresContext, nscoord aContainerWidth)
    dx->GetClientRect(clientRect); // FIXME: GetClientRect looks expensive
    float deviceWidthInches =
      float(clientRect.width) / float(dx->AppUnitsPerPhysicalInch());
-    byInch = NSToCoordRound(effectiveContainerWidth /
+    byInch = NSToCoordRound(aContainerWidth /
                            (deviceWidthInches * 1440 /
                             sFontSizeInflationMinTwips ));
  }
--- a/layout/base/tests/font-inflation/bug707855-innerFrame-ref.html
+++ b/layout/base/tests/font-inflation/bug707855-innerFrame-ref.html
--- a/layout/base/tests/font-inflation/bug707855-innerFrame.html
+++ b/layout/base/tests/font-inflation/bug707855-innerFrame.html
--- a/layout/base/tests/font-inflation/bug707855-ref.html
+++ b/layout/base/tests/font-inflation/bug707855-ref.html
--- a/layout/base/tests/font-inflation/bug707855.html
+++ b/layout/base/tests/font-inflation/bug707855.html
--- a/layout/base/tests/font-inflation/container-with-clamping-innerFrame-ref.html
+++ b/layout/base/tests/font-inflation/container-with-clamping-innerFrame-ref.html
@ -1,15 +0,0 @@
-<!DOCTYPE HTML>
-<style>
-	div { background: yellow }
-	div { font-size: 20px; line-height: 1.0; width: 450px }
-</style>
-<!--
-Without the patch for bug 707855, we have a 450px container, and the minimum font size
-at 15em per line is 30px. This means we map 0px-45px into 30px-45px, so 12px gets mapped
-to 34px.
-
-With the patch, then we have a 240px container, so the minimum font size
-at 15 em per line is 16px. So, we map 0px-24px into 16px-24px, so 12px gets
-mapped to 20px.
-->
-<div>Test to see if too large of a container causes a giant escalation of the font size when font inflation is enabled.</div>
--- a/layout/base/tests/font-inflation/container-with-clamping-innerFrame.html
+++ b/layout/base/tests/font-inflation/container-with-clamping-innerFrame.html
@ -1,15 +0,0 @@
-<!DOCTYPE HTML>
-<style>
-	div { background: yellow }
-	div { font-size: 12px; line-height: 1.0; width: 450px }
-</style>
-<!--
-Without the patch for bug 707855, we have a 450px container, and the minimum font size
-at 15em per line is 30px. This means we map 0px-45px into 30px-45px, so 12px gets mapped
-to 34px.
-
-With the patch, then we have a 240px container, so the minimum font size
-at 15 em per line is 16px. So, we map 0px-24px into 16px-24px, so 12px gets
-mapped to 20px.
-->
-<div>Test to see if too large of a container causes a giant escalation of the font size when font inflation is enabled.</div>
--- a/layout/base/tests/font-inflation/container-with-clamping-ref.html
+++ b/layout/base/tests/font-inflation/container-with-clamping-ref.html
@ -1,16 +0,0 @@
-<!DOCTYPE HTML>
-<style>
-div { background: yellow }
-div { font-size: 12px; line-height: 1.0; width: 1200px }
-</style>
-<!--
-Without the patch for bug 707855, we have a 450px container, and the minimum font size
-at 15em per line is 30px. This means we map 0px-45px into 30px-45px, so 12px gets mapped
-to 34px.
-
-With the patch, then we have a 240px container, so the minimum font size
-at 15 em per line is 16px. So, we map 0px-24px into 16px-24px, so 12px gets
-mapped to 20px.
-->
-<iframe src="container-with-clamping-innerFrame-ref.html" width="240" height="400">
-</iframe>
--- a/layout/base/tests/font-inflation/container-with-clamping.html
+++ b/layout/base/tests/font-inflation/container-with-clamping.html
@ -1,12 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-Without the patch for bug 707855, we have a 450px container, and the minimum font size
-at 15em per line is 30px. This means we map 0px-45px into 30px-45px, so 12px gets mapped
-to 34px.
-
-With the patch, then we have a 240px container, so the minimum font size
-at 15 em per line is 16px. So, we map 0px-24px into 16px-24px, so 12px gets
-mapped to 20px.
-->
-<iframe src="container-with-clamping-innerFrame.html" width="240" height="400">
-</iframe>
--- a/layout/base/tests/test_font_inflation_reftests.html
+++ b/layout/base/tests/test_font_inflation_reftests.html
@ -45,7 +45,6 @@ var gTests = [
  "== textarea-3.html textarea-3-ref.html",
  "== css-transform-1.html css-transform-1-ref.html",
  "== css-transform-2.html css-transform-2-ref.html",
-  "== container-with-clamping.html container-with-clamping-ref.html",
 ];

 // Maintain a reference count of how many things we're waiting for until