[ActiveSuggestionMarker #4] Refactor InlineTextBoxPainter to avoid using CompositionUnderline

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef InlineTextBoxPainter_h
 #define InlineTextBoxPainter_h
 
 #include "core/style/ComputedStyleConstants.h"
 #include "platform/geometry/LayoutRect.h"
 #include "platform/wtf/Allocator.h"
 
 namespace blink {
 
 struct PaintInfo;
 
 class Color;
-class CompositionUnderline;
 class ComputedStyle;
 class DocumentMarker;
 class Font;
 class GraphicsContext;
 class InlineTextBox;
 class LayoutObject;
 class LayoutPoint;
 class LayoutTextCombine;
+class StyleableMarker;
 class TextMatchMarker;
 
 enum class DocumentMarkerPaintPhase { kForeground, kBackground };
 
 class InlineTextBoxPainter {
   STACK_ALLOCATED();
 
  public:
   InlineTextBoxPainter(const InlineTextBox& inline_text_box)
       : inline_text_box_(inline_text_box) {}
@@ skipping 19 matching lines @@
                                       const LayoutPoint& box_origin,
                                       const TextMatchMarker&,
                                       const ComputedStyle&,
                                       const Font&);
 
   static bool PaintsMarkerHighlights(const LayoutObject&);
 
  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,
                       const ComputedStyle&,
                       const Font&,
                       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;
 
   const InlineTextBox& inline_text_box_;
 };
 
 }  // namespace blink
 
 #endif  // InlineTextBoxPainter_h