Index: Source/core/layout/LayoutBlockFlowLine.cpp |
diff --git a/Source/core/layout/LayoutBlockFlowLine.cpp b/Source/core/layout/LayoutBlockFlowLine.cpp |
index 026dfc368696d0e63ac37a88526d786e8a397239..4b8021a5f0cc980ef8ff226d806c3ae3f0eeae11 100644 |
--- a/Source/core/layout/LayoutBlockFlowLine.cpp |
+++ b/Source/core/layout/LayoutBlockFlowLine.cpp |
@@ -1194,8 +1194,8 @@ static inline void stripTrailingSpace(FloatWillBeLayoutUnit& inlineMax, FloatWil |
run.setCodePath(text->canUseSimpleFontCodePath() |
? TextRun::ForceSimple |
: TextRun::ForceComplex); |
- float spaceWidth = font.width(run); |
- inlineMax -= spaceWidth + font.fontDescription().wordSpacing(); |
+ float characterSpaceWidth = font.width(run); |
+ inlineMax -= characterSpaceWidth + font.fontDescription().wordSpacing(); |
if (inlineMin > inlineMax) |
inlineMin = inlineMax; |
} |
@@ -1222,7 +1222,7 @@ void LayoutBlockFlow::computeInlinePreferredLogicalWidths(LayoutUnit& minLogical |
LayoutUnit cw = containingBlock ? containingBlock->contentLogicalWidth() : LayoutUnit(); |
// If we are at the start of a line, we want to ignore all white-space. |
- // Also strip spaces if we previously had text that ended in a trailing space. |
+ // Also strip spaces if we previously had text that ended in a trailing characterSpace. |
bool stripFrontSpaces = true; |
LayoutObject* trailingSpaceChild = 0; |
@@ -1946,12 +1946,12 @@ void LayoutBlockFlow::checkLinesForTextOverflow() |
// Determine the width of the ellipsis using the current font. |
// FIXME: CSS3 says this is configurable, also need to use 0x002E (FULL STOP) if horizontal ellipsis is "not renderable" |
const Font& font = style()->font(); |
- DEFINE_STATIC_LOCAL(AtomicString, ellipsisStr, (&horizontalEllipsis, 1)); |
+ DEFINE_STATIC_LOCAL(AtomicString, ellipsisStr, (&characterHorizontalEllipsis, 1)); |
const Font& firstLineFont = firstLineStyle()->font(); |
// FIXME: We should probably not hard-code the direction here. https://crbug.com/333004 |
TextDirection ellipsisDirection = LTR; |
- float firstLineEllipsisWidth = firstLineFont.width(constructTextRun(this, firstLineFont, &horizontalEllipsis, 1, *firstLineStyle(), ellipsisDirection)); |
- float ellipsisWidth = (font == firstLineFont) ? firstLineEllipsisWidth : font.width(constructTextRun(this, font, &horizontalEllipsis, 1, styleRef(), ellipsisDirection)); |
+ float firstLineEllipsisWidth = firstLineFont.width(constructTextRun(this, firstLineFont, &characterHorizontalEllipsis, 1, *firstLineStyle(), ellipsisDirection)); |
+ float ellipsisWidth = (font == firstLineFont) ? firstLineEllipsisWidth : font.width(constructTextRun(this, font, &characterHorizontalEllipsis, 1, styleRef(), ellipsisDirection)); |
// For LTR text truncation, we want to get the right edge of our padding box, and then we want to see |
// if the right edge of a line box exceeds that. For RTL, we use the left edge of the padding box and |