| Index: third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp
|
| diff --git a/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp b/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp
|
| index 9ac4fea49f4dd9f08459bd7172b6f5d942508c5d..47691222b11373a0e644f4fe1aeefe9c9284ce5c 100644
|
| --- a/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp
|
| +++ b/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp
|
| @@ -547,8 +547,9 @@ void InlineTextBoxPainter::paint(const PaintInfo& paintInfo,
|
|
|
| LayoutPoint boxOrigin(m_inlineTextBox.physicalLocation());
|
| boxOrigin.move(adjustedPaintOffset.x(), adjustedPaintOffset.y());
|
| - LayoutRect boxRect(boxOrigin, LayoutSize(m_inlineTextBox.logicalWidth(),
|
| - m_inlineTextBox.logicalHeight()));
|
| + LayoutRect boxRect(boxOrigin,
|
| + LayoutSize(m_inlineTextBox.logicalWidth(),
|
| + m_inlineTextBox.logicalHeight()));
|
|
|
| int length = m_inlineTextBox.len();
|
| StringView string = StringView(m_inlineTextBox.getLineLayoutItem().text(),
|
| @@ -767,10 +768,11 @@ unsigned InlineTextBoxPainter::underlinePaintStart(
|
| std::max(m_inlineTextBox.start(), underline.startOffset());
|
| // Cap the maximum paint start to (if no truncation) the last character,
|
| // else the last character before the truncation ellipsis.
|
| - return std::min(paintStart, (m_inlineTextBox.truncation() == cNoTruncation)
|
| - ? m_inlineTextBox.end()
|
| - : m_inlineTextBox.start() +
|
| - m_inlineTextBox.truncation() - 1);
|
| + return std::min(
|
| + paintStart,
|
| + (m_inlineTextBox.truncation() == cNoTruncation)
|
| + ? m_inlineTextBox.end()
|
| + : m_inlineTextBox.start() + m_inlineTextBox.truncation() - 1);
|
| }
|
|
|
| unsigned InlineTextBoxPainter::underlinePaintEnd(
|
| @@ -1057,8 +1059,9 @@ void InlineTextBoxPainter::paintSelection(GraphicsContext& context,
|
| StringBuilder charactersWithHyphen;
|
| bool respectHyphen = ePos == length && m_inlineTextBox.hasHyphen();
|
| TextRun textRun = m_inlineTextBox.constructTextRun(
|
| - style, string, m_inlineTextBox.getLineLayoutItem().textLength() -
|
| - m_inlineTextBox.start(),
|
| + style, string,
|
| + m_inlineTextBox.getLineLayoutItem().textLength() -
|
| + m_inlineTextBox.start(),
|
| respectHyphen ? &charactersWithHyphen : 0);
|
| if (respectHyphen)
|
| ePos = textRun.length();
|
| @@ -1357,8 +1360,9 @@ void InlineTextBoxPainter::paintTextMatchMarkerForeground(
|
| textStyle.strokeWidth = style.textStrokeWidth();
|
| textStyle.shadow = 0;
|
|
|
| - LayoutRect boxRect(boxOrigin, LayoutSize(m_inlineTextBox.logicalWidth(),
|
| - m_inlineTextBox.logicalHeight()));
|
| + LayoutRect boxRect(boxOrigin,
|
| + LayoutSize(m_inlineTextBox.logicalWidth(),
|
| + m_inlineTextBox.logicalHeight()));
|
| LayoutPoint textOrigin(boxOrigin.x(),
|
| boxOrigin.y() + fontData->getFontMetrics().ascent());
|
| TextPainter textPainter(paintInfo.context, font, run, textOrigin, boxRect,
|
| @@ -1388,8 +1392,9 @@ void InlineTextBoxPainter::paintTextMatchMarkerBackground(
|
| GraphicsContext& context = paintInfo.context;
|
| GraphicsContextStateSaver stateSaver(context);
|
|
|
| - LayoutRect boxRect(boxOrigin, LayoutSize(m_inlineTextBox.logicalWidth(),
|
| - m_inlineTextBox.logicalHeight()));
|
| + LayoutRect boxRect(boxOrigin,
|
| + LayoutSize(m_inlineTextBox.logicalWidth(),
|
| + m_inlineTextBox.logicalHeight()));
|
| context.clip(FloatRect(boxRect));
|
| context.drawHighlightForText(font, run, FloatPoint(boxOrigin),
|
| boxRect.height().toInt(), color,
|
|
|