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

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

 /*
  * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 256 matching lines @@
 
 PassRefPtr<SimpleFontData> FontCache::getFontData(
     const FontDescription& fontDescription,
     const AtomicString& family,
     AlternateFontName alternameFontName,
     ShouldRetain shouldRetain) {
   if (FontPlatformData* platformData = getFontPlatformData(
           fontDescription, FontFaceCreationParams(
                                adjustFamilyNameToAvoidUnsupportedFonts(family)),
           alternameFontName)) {
-    return fontDataFromFontPlatformData(
-        platformData, shouldRetain, fontDescription.subpixelAscentDescent());
+    return fontDataFromFontPlatformData(platformData, shouldRetain);
   }
 
   return nullptr;
 }
 
 PassRefPtr<SimpleFontData> FontCache::fontDataFromFontPlatformData(
     const FontPlatformData* platformData,
-    ShouldRetain shouldRetain,
-    bool subpixelAscentDescent) {
+    ShouldRetain shouldRetain) {
   if (!gFontDataCache)
     gFontDataCache = new FontDataCache;
 
 #if DCHECK_IS_ON()
   if (shouldRetain == DoNotRetain)
     ASSERT(m_purgePreventCount);
 #endif
 
-  return gFontDataCache->get(platformData, shouldRetain, subpixelAscentDescent);
+  return gFontDataCache->get(platformData, shouldRetain);
 }
 
 bool FontCache::isPlatformFamilyMatchAvailable(
     const FontDescription& fontDescription,
     const AtomicString& family) {
   return getFontPlatformData(
       fontDescription,
       FontFaceCreationParams(adjustFamilyNameToAvoidUnsupportedFonts(family)),
       AlternateFontName::NoAlternate);
 }
@@ skipping 198 matching lines @@
   for (iter = gFallbackListShaperCache->begin();
        iter != gFallbackListShaperCache->end(); ++iter) {
     shapeResultCacheSize += iter->value->byteSize();
   }
   dump->AddScalar("size", "bytes", shapeResultCacheSize);
   memoryDump->AddSuballocation(dump->guid(),
                                WTF::Partitions::kAllocatedObjectPoolName);
 }
 
 }  // namespace blink