Revert of Go back to old underline position and thickness logic

Source/platform/fonts/skia/SimpleFontDataSkia.cpp

Index: Source/platform/fonts/skia/SimpleFontDataSkia.cpp
diff --git a/Source/platform/fonts/skia/SimpleFontDataSkia.cpp b/Source/platform/fonts/skia/SimpleFontDataSkia.cpp
index 47e73c43a1311665b908b31ff3b0a9983eae42fa..f6e955895c722728799323d8e11b2d8e15e3fff9 100644
--- a/Source/platform/fonts/skia/SimpleFontDataSkia.cpp
+++ b/Source/platform/fonts/skia/SimpleFontDataSkia.cpp
@@ -131,6 +131,13 @@
     m_fontMetrics.setLineGap(lineGap);
     m_fontMetrics.setLineSpacing(lroundf(ascent) + lroundf(descent) + lroundf(lineGap));
 
+    SkScalar underlineThickness, underlinePosition;
+    if (metrics.hasUnderlineThickness(&underlineThickness)
+        && metrics.hasUnderlinePosition(&underlinePosition)) {
+        m_fontMetrics.setUnderlineThickness(SkScalarToFloat(underlineThickness));
+        m_fontMetrics.setUnderlinePosition(SkScalarToFloat(-underlinePosition));
+    }
+
     if (platformData().orientation() == Vertical && !isTextOrientationFallback()) {
         static const uint32_t vheaTag = SkSetFourByteTag('v', 'h', 'e', 'a');
         static const uint32_t vorgTag = SkSetFourByteTag('V', 'O', 'R', 'G');