From 4ba2c7fd3e84c9bf870a7b5f97dd221b1324b994 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Sun, 10 Jun 2012 13:02:23 -0700
Subject: [PATCH] Fix source of slight test variation.  (Bug 759755, patch 1)

---
 .../font-inflation/threshold-scope-cell-1-ref.html         | 2 ++
 layout/reftests/font-inflation/threshold-scope-cell-1.html | 2 ++
 .../font-inflation/threshold-scope-cell-2-ref.html         | 2 ++
 layout/reftests/font-inflation/threshold-scope-cell-2.html | 7 ++++---
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/layout/reftests/font-inflation/threshold-scope-cell-1-ref.html b/layout/reftests/font-inflation/threshold-scope-cell-1-ref.html
index 5a6839f862ab..4e06fa9d83f5 100644
--- a/layout/reftests/font-inflation/threshold-scope-cell-1-ref.html
+++ b/layout/reftests/font-inflation/threshold-scope-cell-1-ref.html
@@ -3,6 +3,8 @@
 <style>
 body { font-size: 12px; width: 600px; }
 p { margin: 0 }
+table { border-spacing: 0 } /* FIXME: why is this needed?  Something to do with ComputeDescendantWidth in nsFontInflationData? */
+td { padding: 0 }
 </style>
 <!--
 In a 600px container, the minimum font size at 15em per line is 40px.
diff --git a/layout/reftests/font-inflation/threshold-scope-cell-1.html b/layout/reftests/font-inflation/threshold-scope-cell-1.html
index 4c9c256ac40a..85e8f6f0dacc 100644
--- a/layout/reftests/font-inflation/threshold-scope-cell-1.html
+++ b/layout/reftests/font-inflation/threshold-scope-cell-1.html
@@ -3,6 +3,8 @@
 <style>
 body { font-size: 12px; width: 600px; }
 p { margin: 0 }
+table { border-spacing: 0 } /* FIXME: why is this needed?  Something to do with ComputeDescendantWidth in nsFontInflationData? */
+td { padding: 0 }
 </style>
 <!--
 In a 600px container, the minimum font size at 15em per line is 40px.
diff --git a/layout/reftests/font-inflation/threshold-scope-cell-2-ref.html b/layout/reftests/font-inflation/threshold-scope-cell-2-ref.html
index c1eb9eb36ce8..f42a2fc38286 100644
--- a/layout/reftests/font-inflation/threshold-scope-cell-2-ref.html
+++ b/layout/reftests/font-inflation/threshold-scope-cell-2-ref.html
@@ -3,6 +3,8 @@
 <style>
 body { font-size: 12px; width: 600px; }
 p { margin: 0 }
+table { border-spacing: 0 } /* FIXME: why is this needed?  Something to do with ComputeDescendantWidth in nsFontInflationData? */
+td { padding: 0 }
 </style>
 <!--
 In a 600px container, the minimum font size at 15em per line is 40px.
diff --git a/layout/reftests/font-inflation/threshold-scope-cell-2.html b/layout/reftests/font-inflation/threshold-scope-cell-2.html
index 414c3905a2a4..3e485793c516 100644
--- a/layout/reftests/font-inflation/threshold-scope-cell-2.html
+++ b/layout/reftests/font-inflation/threshold-scope-cell-2.html
@@ -3,6 +3,8 @@
 <style>
 body { font-size: 12px; width: 600px; }
 p { margin: 0 }
+table { border-spacing: 0 } /* FIXME: why is this needed?  Something to do with ComputeDescendantWidth in nsFontInflationData? */
+td { padding: 0 }
 </style>
 <!--
 In a 600px container, the minimum font size at 15em per line is 40px.
@@ -11,13 +13,12 @@ This means we map 0px-60px into 40px-60px, so 12px gets mapped to 44px.
 Further, with a lineThreshold of 100, we need 50 characters of 12px
 text to meet the line threshold.
 -->
-<table><tr><td>123456789
+<table><tr><td style="width: 600px">123456789
 123456789
 123456789
 123456789
 123456789</td></tr>
-<!-- FIXME: Why is it a little off when this width is on the first cell? -->
-<tr><td style="width: 600px">123456789
+<tr><td>123456789
 123456789
 123456789
 123456789