[ActiveSuggestionMarker #4] Refactor InlineTextBoxPainter to avoid using CompositionUnderline

third_party/WebKit/Source/core/paint/InlineTextBoxPainter.h

Index: third_party/WebKit/Source/core/paint/InlineTextBoxPainter.h
diff --git a/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.h b/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.h
index 9b808710bb8fb39def4f495a3f98ec309a383964..814f35f44d068551aed2a20ba4437912ee05b8ea 100644
--- a/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.h
+++ b/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.h
@@ -14,7 +14,6 @@ namespace blink {
 struct PaintInfo;
 
 class Color;
-class CompositionUnderline;
 class ComputedStyle;
 class DocumentMarker;
 class Font;
@@ -23,6 +22,7 @@ class InlineTextBox;
 class LayoutObject;
 class LayoutPoint;
 class LayoutTextCombine;
+class StyleableMarker;
 class TextMatchMarker;
 
 enum class DocumentMarkerPaintPhase { kForeground, kBackground };
@@ -62,13 +62,13 @@ class InlineTextBoxPainter {
  private:
   enum class PaintOptions { kNormal, kCombinedText };
 
-  void PaintSingleCompositionBackgroundRun(GraphicsContext&,
-                                           const LayoutPoint& box_origin,
-                                           const ComputedStyle&,
-                                           const Font&,
-                                           Color background_color,
-                                           int start_pos,
-                                           int end_pos);
+  void PaintSingleMarkerBackgroundRun(GraphicsContext&,
+                                      const LayoutPoint& box_origin,
+                                      const ComputedStyle&,
+                                      const Font&,
+                                      Color background_color,
+                                      int start_pos,
+                                      int end_pos);
   template <PaintOptions>
   void PaintSelection(GraphicsContext&,
                       const LayoutRect& box_rect,
@@ -77,11 +77,11 @@ class InlineTextBoxPainter {
                       Color text_color,
                       LayoutTextCombine* = nullptr);
 
-  void PaintCompositionUnderline(GraphicsContext&,
-                                 const LayoutPoint& box_origin,
-                                 const CompositionUnderline&);
-  unsigned UnderlinePaintStart(const CompositionUnderline&);
-  unsigned UnderlinePaintEnd(const CompositionUnderline&);
+  void PaintStyleableMarkerUnderline(GraphicsContext&,
+                                     const LayoutPoint& box_origin,
+                                     const StyleableMarker&);
+  unsigned MarkerPaintStart(const DocumentMarker&);
+  unsigned MarkerPaintEnd(const DocumentMarker&);
   bool ShouldPaintTextBox(const PaintInfo&);
   void ExpandToIncludeNewlineForSelection(LayoutRect&);
   LayoutObject& InlineLayoutObject() const;