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

Unified Diff: Source/core/rendering/RenderText.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/RenderBlockLineLayout.cpp ('k') | Source/wtf/unicode/CharacterNames.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderText.cpp
diff --git a/Source/core/rendering/RenderText.cpp b/Source/core/rendering/RenderText.cpp
index 95e83d2a5bd25c4264907a8141fc8a3559b143ba..77f11bfd963a91222f65c8dbbf072a976f02043b 100644
--- a/Source/core/rendering/RenderText.cpp
+++ b/Source/core/rendering/RenderText.cpp
@@ -721,23 +721,31 @@ ALWAYS_INLINE float RenderText::widthFromCache(const Font& f, int start, int len
}
if (f.isFixedPitch() && f.fontDescription().variant() == FontVariantNormal && m_isAllASCII && (!glyphOverflow || !glyphOverflow->computeBounds)) {
+ bool missingGlyph = false;
float monospaceCharacterWidth = f.spaceWidth();
float w = 0;
bool isSpace;
ASSERT(m_text);
StringImpl& text = *m_text.impl();
+ RenderStyle * renderStyle = style();
for (int i = start; i < start + len; i++) {
char c = text[i];
+ // If glyph is not present in primary font then we cannot calculate width based on primary
+ // font property, we need to call "width" method of Font Object.
+ if (!f.primaryFontHasGlyphForCharacter(text[i])) {
+ missingGlyph = true;
+ break;
+ }
if (c <= space) {
if (c == space || c == newlineCharacter) {
w += monospaceCharacterWidth;
isSpace = true;
} else if (c == characterTabulation) {
- if (style()->collapseWhiteSpace()) {
+ if (renderStyle->collapseWhiteSpace()) {
w += monospaceCharacterWidth;
isSpace = true;
} else {
- w += f.tabWidth(style()->tabSize(), xPos + w);
+ w += f.tabWidth(renderStyle->tabSize(), xPos + w);
isSpace = false;
}
} else
@@ -749,7 +757,8 @@ ALWAYS_INLINE float RenderText::widthFromCache(const Font& f, int start, int len
if (isSpace && i > start)
w += f.fontDescription().wordSpacing();
}
- return w;
+ if (!missingGlyph)
+ return w;
}
TextRun run = constructTextRun(const_cast<RenderText*>(this), f, this, start, len, style(), textDirection);
« no previous file with comments | « Source/core/rendering/RenderBlockLineLayout.cpp ('k') | Source/wtf/unicode/CharacterNames.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698