Remove unnecessary DrawText methods

Remove unused DrawText methods from Font and GraphicsContext. Also merge
one of the templetized DrawTextInternal methods into the calling method.

Change-Id: I9b19ad4b2d4cc9bcf462c25a38b92c17fa4bd693
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1572207
Auto-Submit: Emil A Eklund <eae@chromium.org>
Reviewed-by: Christian Biesinger <cbiesinger@chromium.org>
Commit-Queue: Christian Biesinger <cbiesinger@chromium.org>
Commit-Queue: Emil A Eklund <eae@chromium.org>
Cr-Commit-Position: refs/heads/master@{#651878}

third_party/blink/renderer/platform/fonts/font.cc

@@ -160,15 +160,6 @@ void Font::DrawText(cc::PaintCanvas* canvas,
   DrawBlobs(canvas, flags, bloberizer.Blobs(), point, node_holder);
 }
 
-void Font::DrawText(cc::PaintCanvas* canvas,
-                    const NGTextFragmentPaintInfo& text_info,
-                    const FloatPoint& point,
-                    float device_scale_factor,
-                    const cc::PaintFlags& flags) const {
-  DrawText(canvas, text_info, point, device_scale_factor,
-           cc::NodeHolder::EmptyNodeHolder(), flags);
-}
-
 void Font::DrawText(cc::PaintCanvas* canvas,
                     const NGTextFragmentPaintInfo& text_info,
                     const FloatPoint& point,

third_party/blink/renderer/platform/fonts/font.h

@@ -96,11 +96,6 @@ class PLATFORM_EXPORT Font {
                 float device_scale_factor,
                 const cc::NodeHolder&,
                 const cc::PaintFlags&) const;
-  void DrawText(cc::PaintCanvas*,
-                const NGTextFragmentPaintInfo&,
-                const FloatPoint&,
-                float device_scale_factor,
-                const cc::PaintFlags&) const;
   void DrawText(cc::PaintCanvas*,
                 const NGTextFragmentPaintInfo&,
                 const FloatPoint&,

third_party/blink/renderer/platform/graphics/graphics_context.cc

@@ -762,33 +762,16 @@ void GraphicsContext::DrawRect(const IntRect& rect) {
   }
 }
 
-template <typename TextPaintInfo>
-void GraphicsContext::DrawTextInternal(const Font& font,
-                                       const TextPaintInfo& text_info,
-                                       const FloatPoint& point,
-                                       const PaintFlags& flags,
-                                       const cc::NodeHolder& node_holder) {
-  if (ContextDisabled())
-    return;
-
-  font.DrawText(canvas_, text_info, point, device_scale_factor_, node_holder,
-                DarkModeFlags(this, flags));
-}
-
 void GraphicsContext::DrawText(const Font& font,
                                const TextRunPaintInfo& text_info,
                                const FloatPoint& point,
                                const PaintFlags& flags,
                                const cc::NodeHolder& node_holder) {
-  DrawTextInternal(font, text_info, point, flags, node_holder);
-}
+  if (ContextDisabled())
+    return;
 
-void GraphicsContext::DrawText(const Font& font,
-                               const NGTextFragmentPaintInfo& text_info,
-                               const FloatPoint& point,
-                               const PaintFlags& flags,
-                               const cc::NodeHolder& node_holder) {
-  DrawTextInternal(font, text_info, point, flags, node_holder);
+  font.DrawText(canvas_, text_info, point, device_scale_factor_, node_holder,
+                DarkModeFlags(this, flags));
 }
 
 template <typename DrawTextFunc>

third_party/blink/renderer/platform/graphics/graphics_context.h

@@ -267,16 +267,13 @@ class PLATFORM_EXPORT GraphicsContext {
                 const FloatPoint&,
                 const cc::NodeHolder&);
 
+  // TODO(layout-dev): This method is only used by SVGInlineTextBoxPainter, see
+  // if we can change that to use the four parameter version above.
   void DrawText(const Font&,
                 const TextRunPaintInfo&,
                 const FloatPoint&,
                 const PaintFlags&,
                 const cc::NodeHolder&);
-  void DrawText(const Font&,
-                const NGTextFragmentPaintInfo&,
-                const FloatPoint&,
-                const PaintFlags&,
-                const cc::NodeHolder&);
 
   void DrawEmphasisMarks(const Font&,
                          const TextRunPaintInfo&,
@@ -408,13 +405,6 @@ class PLATFORM_EXPORT GraphicsContext {
     return paint_state_;
   }
 
-  template <typename TextPaintInfo>
-  void DrawTextInternal(const Font&,
-                        const TextPaintInfo&,
-                        const FloatPoint&,
-                        const PaintFlags&,
-                        const cc::NodeHolder&);
-
   template <typename TextPaintInfo>
   void DrawTextInternal(const Font&,
                         const TextPaintInfo&,