Bug 941611 - More consistent rounding of text metrics. r=karlt, r=fredw

layout/generic/nsTextFrame.cpp

@@ -7382,8 +7382,9 @@ nsTextFrame::GetPrefWidthTightBounds(nsRenderingContext* aContext,
                               ComputeTransformedLength(provider),
                               gfxFont::TIGHT_HINTED_OUTLINE_EXTENTS,
                               aContext->ThebesContext(), &provider);
-  *aX = metrics.mBoundingBox.x;
-  *aXMost = metrics.mBoundingBox.XMost();
+  // Round it like nsTextFrame::ComputeTightBounds() to ensure consistency.
+  *aX = NSToCoordFloor(metrics.mBoundingBox.x);
+  *aXMost = NSToCoordCeil(metrics.mBoundingBox.XMost());
 
   return NS_OK;
 }

layout/reftests/mathml/reftest.list

@@ -44,8 +44,8 @@ skip-if(B2G) == quotes-1.xhtml quotes-1-ref.xhtml
 != stretchy-underbar-1.xhtml stretchy-underbar-1-ref.xhtml 
 == table-width-1.xhtml table-width-1-ref.xhtml
 == table-width-2.html table-width-2-ref.html
-fails-if(OSX||/^Windows\x20NT\x206\.[^0]/.test(http.oscpu)||Android) == table-width-3.html table-width-3-ref.html
-fails-if((OSX&&(OSX<10.8))||/^Windows\x20NT\x206\.[^0]/.test(http.oscpu)||Android) == table-width-4.html table-width-4-ref.html
+== table-width-3.html table-width-3-ref.html
+== table-width-4.html table-width-4-ref.html
 == underbar-width-1.xhtml underbar-width-1-ref.xhtml
 == mathml-type-supported.xhtml mathml-type-supported-ref.xml
 == mtable-align-negative-rownumber.html mtable-align-negative-rownumber-ref.html

layout/reftests/mathml/table-width-1-ref.xhtml

@@ -3,7 +3,10 @@
     <style type="text/css">
       html { background-color: grey; }
       td { border: 1px solid white;
-           padding: 0;
+           padding-top: 0;
+           padding-bottom: 0;
+           padding-right: 1px;
+           padding-left: 1px;
            background-color: black;
            color: red; }
     </style>

layout/reftests/mathml/table-width-1.xhtml

@@ -4,7 +4,10 @@
     <style type="text/css">
       html { background-color: grey; }
       td { border: 1px solid white;
-           padding: 0;
+           padding-top: 0;
+           padding-bottom: 0;
+           padding-right: 1px;
+           padding-left: 1px;
            background-color: black;
            color: black; }
     </style>

layout/reftests/mathml/table-width-3-ref.html

@@ -6,7 +6,10 @@
     <style type="text/css">
       html { background-color: grey; }
       td { border: 1px solid white;
-      padding: 0;
+      padding-top: 0;
+      padding-bottom: 0;
+      padding-right: 1px;
+      padding-left: 1px;
       background-color: black;
       color: red; }
       mi, mtext { font-size: 3em; }

layout/reftests/mathml/table-width-3.html

@@ -6,7 +6,10 @@
     <style type="text/css">
       html { background-color: grey; }
       td { border: 1px solid white;
-      padding: 0;
+      padding-top: 0;
+      padding-bottom: 0;
+      padding-right: 1px;
+      padding-left: 1px;
       background-color: black;
       color: black; }
       mi, mtext { font-size: 3em; }

layout/reftests/mathml/table-width-4-ref.html

@@ -6,7 +6,10 @@
     <style type="text/css">
       html { background-color: grey; }
       td { border: 1px solid white;
-      padding: 0;
+      padding-top: 0;
+      padding-bottom: 0;
+      padding-right: 1px;
+      padding-left: 1px;
       background-color: black;
       color: black; }
     </style>

layout/reftests/mathml/table-width-4.html

@@ -6,7 +6,10 @@
     <style type="text/css">
       html { background-color: grey; }
       td { border: 1px solid white;
-      padding: 0;
+      padding-top: 0;
+      padding-bottom: 0;
+      padding-right: 1px;
+      padding-left: 1px;
       background-color: black;
       color: black; }
     </style>