Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1307)

Unified Diff: Source/core/rendering/RenderBlockLineLayout.cpp

Issue 680213004: Reland of Different fonts selected for width calculation (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Updating Test Expectation Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/InlineTextBox.cpp ('k') | Source/core/rendering/RenderText.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderBlockLineLayout.cpp
diff --git a/Source/core/rendering/RenderBlockLineLayout.cpp b/Source/core/rendering/RenderBlockLineLayout.cpp
index 8a212c0b9d59cf930f25ce4a7778be9c40bd5576..caa1b1a8da338f8bd9ef9720faed19031ea369a3 100644
--- a/Source/core/rendering/RenderBlockLineLayout.cpp
+++ b/Source/core/rendering/RenderBlockLineLayout.cpp
@@ -1939,14 +1939,34 @@ void RenderBlockFlow::deleteEllipsisLineBoxes()
void RenderBlockFlow::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();
+
+ const UChar fullStopString[] = {fullstopCharacter, fullstopCharacter, fullstopCharacter};
+ DEFINE_STATIC_LOCAL(AtomicString, fullstopCharacterStr, (fullStopString, 3));
DEFINE_STATIC_LOCAL(AtomicString, ellipsisStr, (&horizontalEllipsis, 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, style(), ellipsisDirection));
+ float firstLineEllipsisWidth = 0;
+ float ellipsisWidth = 0;
+
+ // As per CSS3 http://www.w3.org/TR/2003/CR-css3-text-20030514/ sequence of three
+ // Full Stops (002E) can be used.
+ if (firstLineFont.primaryFontHasGlyphForCharacter(horizontalEllipsis)) {
+ firstLineEllipsisWidth = firstLineFont.width(constructTextRun(this, firstLineFont, &horizontalEllipsis, 1, firstLineStyle(), ellipsisDirection));
+ } else {
+ ellipsisStr = fullstopCharacterStr;
+ firstLineEllipsisWidth = firstLineFont.width(constructTextRun(this, firstLineFont, &fullstopCharacter, 1, firstLineStyle(), ellipsisDirection)) * 3;
+ }
+ ellipsisWidth = (font == firstLineFont) ? firstLineEllipsisWidth : 0;
+
+ if (!ellipsisWidth) {
+ if (font.primaryFontHasGlyphForCharacter(horizontalEllipsis))
+ ellipsisWidth = font.width(constructTextRun(this, font, &horizontalEllipsis, 1, style(), ellipsisDirection));
+ else
+ ellipsisWidth = font.width(constructTextRun(this, font, &fullstopCharacter, 1, style(), ellipsisDirection)) * 3;
+ }
// 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
« no previous file with comments | « Source/core/rendering/InlineTextBox.cpp ('k') | Source/core/rendering/RenderText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698