Show selection highlight even if we have a composition underline

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

 // 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.
 
 #include "core/paint/InlineTextBoxPainter.h"
 
 #include "core/editing/CompositionUnderline.h"
 #include "core/editing/Editor.h"
 #include "core/editing/markers/DocumentMarkerController.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 133 matching lines @@
       inline_text_box_.GetLineLayoutItem());
 }
 
 bool InlineTextBoxPainter::PaintsMarkerHighlights(
     const LayoutObject& layout_object) {
   return layout_object.GetNode() &&
          layout_object.GetDocument().Markers().HasMarkers(
              layout_object.GetNode());
 }
 
-static bool PaintsCompositionMarkers(const LayoutObject& layout_object) {
-  return layout_object.GetNode() &&
-         layout_object.GetDocument()
-                 .Markers()
-                 .MarkersFor(layout_object.GetNode(),
-                             DocumentMarker::kComposition)
-                 .size() > 0;
-}
-
 static void PrepareContextForDecoration(
     GraphicsContext& context,
     GraphicsContextStateSaver& state_saver,
     bool is_horizontal,
     const TextPainterBase::Style& text_style,
     const LayoutTextCombine* combined_text,
     const LayoutRect& box_rect) {
   TextPainterBase::UpdateGraphicsContext(context, text_style, is_horizontal,
                                          state_saver);
   if (combined_text) {
@@ skipping 219 matching lines @@
 
   int ascent = font_data ? font_data->GetFontMetrics().Ascent() : 0;
   LayoutPoint text_origin(box_origin.X(), box_origin.Y() + ascent);
 
   // 1. Paint backgrounds behind text if needed. Examples of such backgrounds
   // include selection and composition highlights.
   if (paint_info.phase != kPaintPhaseSelection &&
       paint_info.phase != kPaintPhaseTextClip && !is_printing) {
     PaintDocumentMarkers(paint_info, box_origin, style_to_use, font,
                          DocumentMarkerPaintPhase::kBackground);
-
-    const LayoutObject& text_box_layout_object = InlineLayoutObject();
-    if (have_selection && !PaintsCompositionMarkers(text_box_layout_object)) {
+    if (have_selection) {
       if (combined_text)
         PaintSelection<InlineTextBoxPainter::PaintOptions::kCombinedText>(
             context, box_rect, style_to_use, font, selection_style.fill_color,
             combined_text);
       else
         PaintSelection<InlineTextBoxPainter::PaintOptions::kNormal>(
             context, box_rect, style_to_use, font, selection_style.fill_color);
     }
   }
 
@@ skipping 766 matching lines @@
 
   LayoutRect box_rect(box_origin, LayoutSize(inline_text_box_.LogicalWidth(),
                                              inline_text_box_.LogicalHeight()));
   context.Clip(FloatRect(box_rect));
   context.DrawHighlightForText(font, run, FloatPoint(box_origin),
                                box_rect.Height().ToInt(), color,
                                paint_offsets.first, paint_offsets.second);
 }
 
 }  // namespace blink