[cleanup] Remove some now dead code!

"NeedsHackForTextControlWithFontFamily" behaviour was removed:
https://chromium-review.googlesource.com/c/chromium/src/+/1019405/

And TextBlockLogical{Width,Height} was simply dead. :)

This shouldn't change any behaviour. \o/

Change-Id: Ia267e88593cea94606b6f286058a4be887c01bff
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1909267
Auto-Submit: Ian Kilpatrick <ikilpatrick@chromium.org>
Reviewed-by: Koji Ishii <kojii@chromium.org>
Commit-Queue: Ian Kilpatrick <ikilpatrick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#714399}

third_party/blink/renderer/core/layout/layout_text_control.cc

@@ -70,22 +70,6 @@ void LayoutTextControl::StyleDidChange(StyleDifference diff,
   }
 }
 
-int LayoutTextControl::TextBlockLogicalHeight() const {
-  return (LogicalHeight() - BorderAndPaddingLogicalHeight()).ToInt();
-}
-
-int LayoutTextControl::TextBlockLogicalWidth() const {
-  Element* inner_editor = InnerEditorElement();
-  DCHECK(inner_editor);
-
-  LayoutUnit unit_width = LogicalWidth() - BorderAndPaddingLogicalWidth();
-  if (inner_editor->GetLayoutObject())
-    unit_width -= inner_editor->GetLayoutBox()->PaddingStart() +
-                  inner_editor->GetLayoutBox()->PaddingEnd();
-
-  return unit_width.ToInt();
-}
-
 int LayoutTextControl::ScrollbarThickness() const {
   // FIXME: We should get the size of the scrollbar from the LayoutTheme
   // instead.
@@ -224,14 +208,6 @@ float LayoutTextControl::GetAvgCharWidth(const AtomicString& family) const {
   return font.Width(text_run);
 }
 
-float LayoutTextControl::ScaleEmToUnits(int x) const {
-  // This matches the unitsPerEm value for MS Shell Dlg and Courier New from the
-  // "head" font table.
-  float units_per_em = 2048.0f;
-  return roundf(StyleRef().GetFont().GetFontDescription().ComputedSize() * x /
-                units_per_em);
-}
-
 void LayoutTextControl::ComputeIntrinsicLogicalWidths(
     LayoutUnit& min_logical_width,
     LayoutUnit& max_logical_width) const {

third_party/blink/renderer/core/layout/layout_text_control.h

@@ -60,14 +60,9 @@ class CORE_EXPORT LayoutTextControl : public LayoutBlockFlow {
                              const HitTestLocation&,
                              const PhysicalOffset& accumulated_offset);
 
-  int TextBlockLogicalWidth() const;
-  int TextBlockLogicalHeight() const;
-
-  float ScaleEmToUnits(int x) const;
-
   static bool HasValidAvgCharWidth(const SimpleFontData*,
                                    const AtomicString& family);
-  virtual float GetAvgCharWidth(const AtomicString& family) const;
+  float GetAvgCharWidth(const AtomicString& family) const;
   virtual LayoutUnit PreferredContentLogicalWidth(float char_width) const = 0;
   virtual LayoutUnit ComputeControlLogicalHeight(
       LayoutUnit line_height,

third_party/blink/renderer/core/layout/layout_text_control_multi_line.cc

@@ -56,18 +56,6 @@ bool LayoutTextControlMultiLine::NodeAtPoint(
   return true;
 }
 
-float LayoutTextControlMultiLine::GetAvgCharWidth(
-    const AtomicString& family) const {
-  // Match the default system font to the width of MS Shell Dlg, the default
-  // font for textareas in Firefox, Safari Win and IE for some encodings (in
-  // IE, the default font is encoding specific). 1229 is the avgCharWidth
-  // value in the OS/2 table for Courier New.
-  if (LayoutTheme::GetTheme().NeedsHackForTextControlWithFontFamily(family))
-    return ScaleEmToUnits(1229);
-
-  return LayoutTextControl::GetAvgCharWidth(family);
-}
-
 LayoutUnit LayoutTextControlMultiLine::PreferredContentLogicalWidth(
     float char_width) const {
   int factor = ToHTMLTextAreaElement(GetNode())->cols();

third_party/blink/renderer/core/layout/layout_text_control_multi_line.h

@@ -44,7 +44,6 @@ class LayoutTextControlMultiLine final : public LayoutTextControl {
                    const PhysicalOffset& accumulated_offset,
                    HitTestAction) override;
 
-  float GetAvgCharWidth(const AtomicString& family) const override;
   LayoutUnit PreferredContentLogicalWidth(float char_width) const override;
   LayoutUnit ComputeControlLogicalHeight(
       LayoutUnit line_height,

third_party/blink/renderer/core/layout/layout_text_control_single_line.cc

@@ -208,18 +208,6 @@ PhysicalRect LayoutTextControlSingleLine::ControlClipRect(
   return clip_rect;
 }
 
-float LayoutTextControlSingleLine::GetAvgCharWidth(
-    const AtomicString& family) const {
-  // Match the default system font to the width of MS Shell Dlg, the default
-  // font for textareas in Firefox, Safari Win and IE for some encodings (in
-  // IE, the default font is encoding specific). 901 is the avgCharWidth value
-  // in the OS/2 table for MS Shell Dlg.
-  if (LayoutTheme::GetTheme().NeedsHackForTextControlWithFontFamily(family))
-    return ScaleEmToUnits(901);
-
-  return LayoutTextControl::GetAvgCharWidth(family);
-}
-
 LayoutUnit LayoutTextControlSingleLine::PreferredContentLogicalWidth(
     float char_width) const {
   int factor;
@@ -233,13 +221,7 @@ LayoutUnit LayoutTextControlSingleLine::PreferredContentLogicalWidth(
   float max_char_width = 0.f;
   const Font& font = StyleRef().GetFont();
   AtomicString family = font.GetFontDescription().Family().Family();
-  // Match the default system font to the width of MS Shell Dlg, the default
-  // font for textareas in Firefox, Safari Win and IE for some encodings (in
-  // IE, the default font is encoding specific). 4027 is the (xMax - xMin)
-  // value in the "head" font table for MS Shell Dlg.
-  if (LayoutTheme::GetTheme().NeedsHackForTextControlWithFontFamily(family))
-    max_char_width = ScaleEmToUnits(4027);
-  else if (HasValidAvgCharWidth(font.PrimaryFont(), family))
+  if (HasValidAvgCharWidth(font.PrimaryFont(), family))
     max_char_width = roundf(font.PrimaryFont()->MaxCharWidth());
 
   // For text inputs, IE adds some extra width.

third_party/blink/renderer/core/layout/layout_text_control_single_line.h

@@ -68,7 +68,6 @@ class LayoutTextControlSingleLine : public LayoutTextControl {
   LayoutUnit ScrollHeight() const final;
 
   int TextBlockWidth() const;
-  float GetAvgCharWidth(const AtomicString& family) const final;
   LayoutUnit PreferredContentLogicalWidth(float char_width) const final;
   LayoutUnit ComputeControlLogicalHeight(
       LayoutUnit line_height,

third_party/blink/renderer/core/layout/layout_theme.h

@@ -200,13 +200,6 @@ class CORE_EXPORT LayoutTheme : public RefCounted<LayoutTheme> {
   void SystemFont(CSSValueID system_font_id, FontDescription&);
   virtual Color SystemColor(CSSValueID, WebColorScheme color_scheme) const;
 
-  // Whether the default system font should have its average character width
-  // adjusted to match MS Shell Dlg.
-  virtual bool NeedsHackForTextControlWithFontFamily(
-      const AtomicString&) const {
-    return false;
-  }
-
   virtual int MinimumMenuListSize(const ComputedStyle&) const { return 0; }
 
   virtual void AdjustSliderThumbSize(ComputedStyle&) const;