diff --git a/gfx/thebes/gfxDWriteFonts.cpp b/gfx/thebes/gfxDWriteFonts.cpp index 00b988e7a601..32f3106240db 100644 --- a/gfx/thebes/gfxDWriteFonts.cpp +++ b/gfx/thebes/gfxDWriteFonts.cpp @@ -203,8 +203,8 @@ gfxDWriteFont::ComputeMetrics(AntialiasOption anAAOption) mMetrics->xHeight = fontMetrics.xHeight * mFUnitsConvFactor; mMetrics->capHeight = fontMetrics.capHeight * mFUnitsConvFactor; - mMetrics->maxAscent = ceil(fontMetrics.ascent * mFUnitsConvFactor); - mMetrics->maxDescent = ceil(fontMetrics.descent * mFUnitsConvFactor); + mMetrics->maxAscent = round(fontMetrics.ascent * mFUnitsConvFactor); + mMetrics->maxDescent = round(fontMetrics.descent * mFUnitsConvFactor); mMetrics->maxHeight = mMetrics->maxAscent + mMetrics->maxDescent; mMetrics->emHeight = mAdjustedSize; diff --git a/layout/reftests/bugs/368020-1-ref.html b/layout/reftests/bugs/368020-1-ref.html index 8b9b858bf195..3b40369af5e5 100644 --- a/layout/reftests/bugs/368020-1-ref.html +++ b/layout/reftests/bugs/368020-1-ref.html @@ -5,7 +5,7 @@ -
+
diff --git a/layout/reftests/bugs/368020-1.html b/layout/reftests/bugs/368020-1.html index 7195644629df..2c5c6e260fd0 100644 --- a/layout/reftests/bugs/368020-1.html +++ b/layout/reftests/bugs/368020-1.html @@ -5,7 +5,7 @@ -
+
diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list index 7882fbe25700..21cdcdc03cbb 100644 --- a/layout/reftests/bugs/reftest.list +++ b/layout/reftests/bugs/reftest.list @@ -1195,7 +1195,7 @@ fuzzy-if(webrender,4,361) == 449519-1.html 449519-1-ref.html == 455171-5.html 455171-5-ref.html == 455280-1.xhtml 455280-1-ref.xhtml == 455826-1.html 455826-1-ref.html -fails-if(Android||cocoaWidget) fuzzy-if(webrender&&winWidget,222-222,2806-2806) == 456147.xul 456147-ref.html # bug 458047 +fails-if(Android||cocoaWidget||winWidget) == 456147.xul 456147-ref.html # bug 458047 fuzzy-if(Android,11,41) fuzzy-if(winWidget||gtkWidget,4,6) fuzzy-if(d2d,15,69) fuzzy-if(skiaContent,42,154) == 456219-1a.html 456219-1-ref.html # bug 1128229 fuzzy-if(Android,11,41) fuzzy-if(winWidget||gtkWidget,4,6) fuzzy-if(d2d,15,69) fuzzy-if(skiaContent,42,154) == 456219-1b.html 456219-1-ref.html # bug 1128229 fuzzy-if(Android,11,41) fuzzy-if(winWidget||gtkWidget,4,6) fuzzy-if(d2d,15,69) fuzzy-if(skiaContent,42,154) == 456219-1c.html 456219-1-ref.html # bug 1128229 diff --git a/layout/reftests/css-sizing/min-intrinsic-with-percents-across-elements-ref.html b/layout/reftests/css-sizing/min-intrinsic-with-percents-across-elements-ref.html index 57dd5ac56c49..09990cc56365 100644 --- a/layout/reftests/css-sizing/min-intrinsic-with-percents-across-elements-ref.html +++ b/layout/reftests/css-sizing/min-intrinsic-with-percents-across-elements-ref.html @@ -3,6 +3,7 @@