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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutTextControl.cpp

Issue 2149683002: Check for primaryFont in LayoutTextControl::getAvgCharWidth (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase w/HEAD Created 4 years, 5 months 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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';
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698