Update composition underline start/end constraints.

third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.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/SVGInlineTextBoxPainter.h"
 
 #include "core/editing/Editor.h"
 #include "core/editing/markers/DocumentMarkerController.h"
 #include "core/editing/markers/RenderedDocumentMarker.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 65 matching lines @@
 LayoutSVGInlineText& SVGInlineTextBoxPainter::inlineText() const
 {
     return toLayoutSVGInlineText(inlineLayoutObject());
 }
 
 void SVGInlineTextBoxPainter::paint(const PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     ASSERT(paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPhaseSelection);
     ASSERT(m_svgInlineTextBox.truncation() == cNoTruncation);
 
-    if (m_svgInlineTextBox.getLineLayoutItem().style()->visibility() != EVisibility::Visible)
+    if (m_svgInlineTextBox.getLineLayoutItem().style()->visibility() != EVisibility::Visible
+        || !m_svgInlineTextBox.len())
         return;
 
     // We're explicitly not supporting composition & custom underlines and custom highlighters -- unlike InlineTextBox.
     // If we ever need that for SVG, it's very easy to refactor and reuse the code.
 
     bool haveSelection = shouldPaintSelection(paintInfo);
     if (!haveSelection && paintInfo.phase == PaintPhaseSelection)
         return;
 
     LayoutSVGInlineText& textLayoutObject = inlineText();
     if (!textShouldBePainted(textLayoutObject))
         return;
 
     DisplayItem::Type displayItemType = DisplayItem::paintPhaseToDrawingType(paintInfo.phase);
     if (!DrawingRecorder::useCachedDrawingIfPossible(paintInfo.context, m_svgInlineTextBox, displayItemType)) {
         LayoutObject& parentLayoutObject = parentInlineLayoutObject();
         const ComputedStyle& style = parentLayoutObject.styleRef();
 
         bool includeSelectionRect = paintInfo.phase != PaintPhaseSelection
             && (haveSelection || InlineTextBoxPainter::paintsMarkerHighlights(textLayoutObject));
         DrawingRecorder recorder(paintInfo.context, m_svgInlineTextBox, displayItemType,
             boundsForDrawingRecorder(paintInfo, style, paintOffset, includeSelectionRect));
-        InlineTextBoxPainter(m_svgInlineTextBox).paintDocumentMarkers(
-            paintInfo, paintOffset, style,
+        InlineTextBoxPainter textPainter(m_svgInlineTextBox);
+        textPainter.paintDocumentMarkers(paintInfo, paintOffset, style,
             textLayoutObject.scaledFont(), DocumentMarkerPaintPhase::Background);
 
         if (!m_svgInlineTextBox.textFragments().isEmpty())
             paintTextFragments(paintInfo, parentLayoutObject);
 
-        InlineTextBoxPainter(m_svgInlineTextBox).paintDocumentMarkers(
-            paintInfo, paintOffset, style,
+        textPainter.paintDocumentMarkers(paintInfo, paintOffset, style,
             textLayoutObject.scaledFont(), DocumentMarkerPaintPhase::Foreground);
     }
 }
 
 void SVGInlineTextBoxPainter::paintTextFragments(const PaintInfo& paintInfo, LayoutObject& parentLayoutObject)
 {
     const ComputedStyle& style = parentLayoutObject.styleRef();
     const SVGComputedStyle& svgStyle = style.svgStyle();
 
     bool hasFill = svgStyle.hasFill();
@@ skipping 406 matching lines @@
             stateSaver.save();
             paintInfo.context.concatCTM(fragment.buildFragmentTransform());
         }
         FloatRect fragmentRect = m_svgInlineTextBox.selectionRectForTextFragment(fragment, textMatchInfo.startPosition, textMatchInfo.endPosition, style);
         paintInfo.context.setFillColor(color);
         paintInfo.context.fillRect(fragmentRect);
     }
 }
 
 } // namespace blink