Always use original ascent/descent for FontMetrics::floatAscent|floatDescent

third_party/WebKit/Source/platform/fonts/FontCache.cpp

Index: third_party/WebKit/Source/platform/fonts/FontCache.cpp
diff --git a/third_party/WebKit/Source/platform/fonts/FontCache.cpp b/third_party/WebKit/Source/platform/fonts/FontCache.cpp
index 6cb2906c272c7e70023133e9f90adb824b59085f..bd42bb6b04032b853649d9a0ca1171dbbb80aada 100644
--- a/third_party/WebKit/Source/platform/fonts/FontCache.cpp
+++ b/third_party/WebKit/Source/platform/fonts/FontCache.cpp
@@ -274,8 +274,7 @@ PassRefPtr<SimpleFontData> FontCache::getFontData(
           fontDescription, FontFaceCreationParams(
                                adjustFamilyNameToAvoidUnsupportedFonts(family)),
           alternameFontName)) {
-    return fontDataFromFontPlatformData(
-        platformData, shouldRetain, fontDescription.subpixelAscentDescent());
+    return fontDataFromFontPlatformData(platformData, shouldRetain);
   }
 
   return nullptr;
@@ -283,8 +282,7 @@ PassRefPtr<SimpleFontData> FontCache::getFontData(
 
 PassRefPtr<SimpleFontData> FontCache::fontDataFromFontPlatformData(
     const FontPlatformData* platformData,
-    ShouldRetain shouldRetain,
-    bool subpixelAscentDescent) {
+    ShouldRetain shouldRetain) {
   if (!gFontDataCache)
     gFontDataCache = new FontDataCache;
 
@@ -293,7 +291,7 @@ PassRefPtr<SimpleFontData> FontCache::fontDataFromFontPlatformData(
     ASSERT(m_purgePreventCount);
 #endif
 
-  return gFontDataCache->get(platformData, shouldRetain, subpixelAscentDescent);
+  return gFontDataCache->get(platformData, shouldRetain);
 }
 
 bool FontCache::isPlatformFamilyMatchAvailable(