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

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

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 28 matching lines @@
 #if !OS(ANDROID)
 const unsigned cMaxInactiveFontData = 250;
 const unsigned cTargetInactiveFontData = 200;
 #else
 const unsigned cMaxInactiveFontData = 225;
 const unsigned cTargetInactiveFontData = 200;
 #endif
 
 PassRefPtr<SimpleFontData> FontDataCache::get(
     const FontPlatformData* platformData,
-    ShouldRetain shouldRetain,
-    bool subpixelAscentDescent) {
+    ShouldRetain shouldRetain) {
   if (!platformData)
     return nullptr;
 
   // TODO: crbug.com/446376 - This should not happen, but we currently
   // do not have a reproduction for the crash that an empty typeface()
   // causes downstream from here.
   if (!platformData->typeface()) {
     DLOG(ERROR)
         << "Empty typeface() in FontPlatformData when accessing FontDataCache.";
     return nullptr;
   }
 
   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
     // the address of the newly created FontPlatformData that is copied an owned
     // by SimpleFontData.
     m_cache.set(&newValue.first->platformData(), newValue);
     if (shouldRetain == DoNotRetain)
       m_inactiveFontData.insert(newValue.first);
     return newValue.first.release();
   }
@@ skipping 85 matching lines @@
   bool didWork = fontDataToDelete.size();
 
   fontDataToDelete.clear();
 
   isPurging = false;
 
   return didWork;
 }
 
 }  // namespace blink