Index: third_party/WebKit/Source/core/layout/LayoutTextControl.cpp |
diff --git a/third_party/WebKit/Source/core/layout/LayoutTextControl.cpp b/third_party/WebKit/Source/core/layout/LayoutTextControl.cpp |
index e8ee104847271c40bf0e0a1bf8b00699bf61c968..e183ae86c67ecc69fcacbebf9695245b02574798 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutTextControl.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutTextControl.cpp |
@@ -216,8 +216,9 @@ bool LayoutTextControl::hasValidAvgCharWidth(const SimpleFontData* font, const A |
float LayoutTextControl::getAvgCharWidth(const AtomicString& family) const |
{ |
const Font& font = style()->font(); |
+ |
const SimpleFontData* primaryFont = font.primaryFont(); |
- if (hasValidAvgCharWidth(primaryFont, family)) |
+ if (primaryFont && hasValidAvgCharWidth(primaryFont, family)) |
return roundf(primaryFont->avgCharWidth()); |
const UChar ch = '0'; |