Index: Source/core/rendering/RenderText.cpp |
diff --git a/Source/core/rendering/RenderText.cpp b/Source/core/rendering/RenderText.cpp |
index 1acc6fef0606a9bf48ee50c93088b17e70923477..afcc1d686eae97abf56dfe5652e97bbcace60218 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); |