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

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

Index: third_party/WebKit/Source/platform/fonts/FontDataCache.cpp
diff --git a/third_party/WebKit/Source/platform/fonts/FontDataCache.cpp b/third_party/WebKit/Source/platform/fonts/FontDataCache.cpp
index 06f615c70b7a03034c84925e1c6af6f97b2ed4c4..66bc3eda746719d0cc0a2a2fd51ec9e9cb25b998 100644
--- a/third_party/WebKit/Source/platform/fonts/FontDataCache.cpp
+++ b/third_party/WebKit/Source/platform/fonts/FontDataCache.cpp
@@ -46,8 +46,7 @@ const unsigned cTargetInactiveFontData = 200;
 
 PassRefPtr<SimpleFontData> FontDataCache::get(
     const FontPlatformData* platformData,
-    ShouldRetain shouldRetain,
-    bool subpixelAscentDescent) {
+    ShouldRetain shouldRetain) {
   if (!platformData)
     return nullptr;
 
@@ -63,8 +62,7 @@ PassRefPtr<SimpleFontData> FontDataCache::get(
   Cache::iterator result = m_cache.find(platformData);
   if (result == m_cache.end()) {
     std::pair<RefPtr<SimpleFontData>, unsigned> newValue(
-        SimpleFontData::create(*platformData, nullptr, false,
-                               subpixelAscentDescent),
+        SimpleFontData::create(*platformData, nullptr),
         shouldRetain == Retain ? 1 : 0);
     // The new SimpleFontData takes a copy of the incoming FontPlatformData
     // object. The incoming key may be temporary. So, for cache storage, take