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

third_party/WebKit/Source/core/layout/LayoutText.cpp

 /*
  * (C) 1999 Lars Knoll (knoll@kde.org)
  * (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 1939 matching lines @@
     LayoutRect logicalVisualOverflow = curr->logicalOverflowRect();
     logicalLeftSide = std::min(logicalLeftSide, logicalVisualOverflow.x());
     logicalRightSide = std::max(logicalRightSide, logicalVisualOverflow.maxX());
   }
 
   LayoutUnit logicalTop = firstTextBox()->logicalTopVisualOverflow();
   LayoutUnit logicalWidth = logicalRightSide - logicalLeftSide;
   LayoutUnit logicalHeight =
       lastTextBox()->logicalBottomVisualOverflow() - logicalTop;
 
-  // Inflate visual overflow if we have adjusted ascent/descent causing the
-  // painted glyphs to overflow the layout geometries based on the adjusted
+  // Inflate visual overflow if we have rounded down ascent/descent causing the
+  // painted glyphs to overflow the layout geometries based on the rounded down
   // ascent/descent.
   int inflationForAscent = 0;
   int inflationForDescent = 0;
   const auto* font =
       styleRef(firstTextBox()->isFirstLineStyle()).font().primaryFont();
-  if (font) {
-    inflationForAscent =
-        font->getFontMetrics().visualOverflowInflationForAscent();
-  }
+  if (font &&
+      font->getFontMetrics().ascent() < font->getFontMetrics().floatAscent())
+    inflationForAscent = 1;
   if (lastTextBox()->isFirstLineStyle() != firstTextBox()->isFirstLineStyle())
     font = styleRef(lastTextBox()->isFirstLineStyle()).font().primaryFont();
-  if (font) {
-    inflationForDescent =
-        font->getFontMetrics().visualOverflowInflationForDescent();
-  }
+  if (font &&
+      font->getFontMetrics().descent() < font->getFontMetrics().floatDescent())
+    inflationForDescent = 1;
   logicalTop -= inflationForAscent;
   logicalHeight += inflationForAscent + inflationForDescent;
 
   LayoutRect rect(logicalLeftSide, logicalTop, logicalWidth, logicalHeight);
   if (!style()->isHorizontalWritingMode())
     rect = rect.transposedRect();
   return rect;
 }
 
 LayoutRect LayoutText::localVisualRect() const {
@@ skipping 125 matching lines @@
   LayoutRect rect = LayoutRect(
       IntRect(firstRunX(), firstRunY(), linesBox.width(), linesBox.height()));
   LayoutBlock* block = containingBlock();
   if (block && hasTextBoxes())
     block->adjustChildDebugRect(rect);
 
   return rect;
 }
 
 }  // namespace blink