Reland of Don't paint underline or selections over ellipsis in mixed-flow contexts

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

Index: third_party/WebKit/Source/core/paint/TextPainter.cpp
diff --git a/third_party/WebKit/Source/core/paint/TextPainter.cpp b/third_party/WebKit/Source/core/paint/TextPainter.cpp
index 95c02bdc54bdc641501c9078a7330a6fae5dbfce..36a1f3b13d24943015abf1ef5f64399c8f200948 100644
--- a/third_party/WebKit/Source/core/paint/TextPainter.cpp
+++ b/third_party/WebKit/Source/core/paint/TextPainter.cpp
@@ -36,7 +36,8 @@
       m_textBounds(textBounds),
       m_horizontal(horizontal),
       m_emphasisMarkOffset(0),
-      m_combinedText(0) {}
+      m_combinedText(0),
+      m_ellipsisOffset(0) {}
 
 TextPainter::~TextPainter() {}
 
@@ -247,7 +248,7 @@
     paintInternalRun<Step>(textRunPaintInfo, startOffset, endOffset);
   } else {
     if (endOffset > 0)
-      paintInternalRun<Step>(textRunPaintInfo, 0, endOffset);
+      paintInternalRun<Step>(textRunPaintInfo, m_ellipsisOffset, endOffset);
     if (startOffset < truncationPoint)
       paintInternalRun<Step>(textRunPaintInfo, startOffset, truncationPoint);
   }