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

third_party/WebKit/Source/core/paint/TextPainter.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/TextPainter.h"
 
 #include "core/CSSPropertyNames.h"
 #include "core/frame/Settings.h"
 #include "core/layout/LayoutObject.h"
 #include "core/layout/LayoutTextCombine.h"
@@ skipping 18 matching lines @@
                          const LayoutPoint& textOrigin,
                          const LayoutRect& textBounds,
                          bool horizontal)
     : m_graphicsContext(context),
       m_font(font),
       m_run(run),
       m_textOrigin(textOrigin),
       m_textBounds(textBounds),
       m_horizontal(horizontal),
       m_emphasisMarkOffset(0),
-      m_combinedText(0) {}
+      m_combinedText(0),
+      m_ellipsisOffset(0) {}
 
 TextPainter::~TextPainter() {}
 
 void TextPainter::setEmphasisMark(const AtomicString& emphasisMark,
                                   TextEmphasisPosition position) {
   m_emphasisMark = emphasisMark;
   const SimpleFontData* fontData = m_font.primaryFont();
   DCHECK(fontData);
 
   if (!fontData || emphasisMark.isNull()) {
@@ skipping 190 matching lines @@
                                 unsigned truncationPoint,
                                 TextBlobPtr* cachedTextBlob) {
   TextRunPaintInfo textRunPaintInfo(m_run);
   textRunPaintInfo.bounds = FloatRect(m_textBounds);
   if (startOffset <= endOffset) {
     // FIXME: We should be able to use cachedTextBlob in more cases.
     textRunPaintInfo.cachedTextBlob = cachedTextBlob;
     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);
   }
 }
 
 void TextPainter::clipDecorationsStripe(float upper,
                                         float stripeWidth,
                                         float dilation) {
   TextRunPaintInfo textRunPaintInfo(m_run);
 
@@ skipping 39 matching lines @@
   TextRunPaintInfo textRunPaintInfo(placeholderTextRun);
   textRunPaintInfo.bounds = FloatRect(m_textBounds);
   m_graphicsContext.concatCTM(rotation(m_textBounds, Clockwise));
   m_graphicsContext.drawEmphasisMarks(m_combinedText->originalFont(),
                                       textRunPaintInfo, m_emphasisMark,
                                       emphasisMarkTextOrigin);
   m_graphicsContext.concatCTM(rotation(m_textBounds, Counterclockwise));
 }
 
 }  // namespace blink