| Index: third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp b/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp
|
| index 522082bb94eb8e9005c6c6294da8f72b0f4bd903..c3e2f3fbb04d0b9bafb300f3a41e805723bf8f9e 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp
|
| @@ -621,9 +621,11 @@ static inline void setLogicalWidthForTextRun(
|
| measuredWidth = 0;
|
| }
|
|
|
| - glyphOverflow.setFromBounds(glyphBounds, font.getFontMetrics().floatAscent(),
|
| - font.getFontMetrics().floatDescent(),
|
| - measuredWidth);
|
| + const SimpleFontData* fontData = font.primaryFont();
|
| + DCHECK(fontData);
|
| + glyphOverflow.setFromBounds(
|
| + glyphBounds, fontData ? fontData->getFontMetrics().floatAscent() : 0,
|
| + fontData ? fontData->getFontMetrics().floatDescent() : 0, measuredWidth);
|
|
|
| run->m_box->setLogicalWidth(LayoutUnit(measuredWidth) + hyphenWidth);
|
| if (!fallbackFonts.isEmpty()) {
|
|
|