diff --git a/gfx/thebes/src/gfxWindowsFonts.cpp b/gfx/thebes/src/gfxWindowsFonts.cpp
index e51348a1a4cd..728706a3b4f2 100644
--- a/gfx/thebes/src/gfxWindowsFonts.cpp
+++ b/gfx/thebes/src/gfxWindowsFonts.cpp
@@ -1137,24 +1137,8 @@ gfxWindowsFont::Measure(gfxTextRun *aTextRun,
}
}
- gfxFont::RunMetrics metrics = gfxFont::Measure(aTextRun, aStart, aEnd,
- aBoundingBoxType, aRefContext,
- aSpacing);
-
- // if aBoundingBoxType is LOOSE_INK_EXTENTS
- // and the underlying cairo font may be antialiased,
- // we can't trust Windows to have considered all the pixels
- // so we need to add "padding" to the bounds.
- // (see bugs 475968, 439831, compare also bug 445087)
- if (aBoundingBoxType == LOOSE_INK_EXTENTS &&
- mAntialiasOption != CAIRO_ANTIALIAS_NONE &&
- metrics.mBoundingBox.size.width > 0) {
- const PRUint32 appUnitsPerDevUnit = aTextRun->GetAppUnitsPerDevUnit();
- metrics.mBoundingBox.pos.x -= appUnitsPerDevUnit;
- metrics.mBoundingBox.size.width += 3 * appUnitsPerDevUnit;
- }
-
- return metrics;
+ return gfxFont::Measure(aTextRun, aStart, aEnd,
+ aBoundingBoxType, aRefContext, aSpacing);
}
FontEntry*
diff --git a/layout/reftests/bugs/308406-1-ref.html b/layout/reftests/bugs/308406-1-ref.html
index b12fa08c8e81..7dd1af8dbac8 100644
--- a/layout/reftests/bugs/308406-1-ref.html
+++ b/layout/reftests/bugs/308406-1-ref.html
@@ -1,10 +1,5 @@
-
-
-
diff --git a/layout/reftests/bugs/308406-1.html b/layout/reftests/bugs/308406-1.html
index b4507aecc352..15b70d73c21d 100644
--- a/layout/reftests/bugs/308406-1.html
+++ b/layout/reftests/bugs/308406-1.html
@@ -1,10 +1,5 @@
-
-
-
diff --git a/layout/reftests/bugs/308406-2-ref.html b/layout/reftests/bugs/308406-2-ref.html
index d60c1997a7eb..307e9d66556f 100644
--- a/layout/reftests/bugs/308406-2-ref.html
+++ b/layout/reftests/bugs/308406-2-ref.html
@@ -1,9 +1,4 @@
-
-
-
diff --git a/layout/reftests/bugs/308406-2.html b/layout/reftests/bugs/308406-2.html
index 8da753e45b62..d2ab236a522f 100644
--- a/layout/reftests/bugs/308406-2.html
+++ b/layout/reftests/bugs/308406-2.html
@@ -1,9 +1,4 @@
-
-
-