| Index: third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp
|
| diff --git a/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp b/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp
|
| index 413e9ef887bd3fdba9f76bcc460e4baf18c67e5d..e94ddd0bf2d49fdc55dc6a42ca51b3bbcb9eabcd 100644
|
| --- a/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp
|
| +++ b/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp
|
| @@ -329,8 +329,13 @@ void SVGInlineTextBoxPainter::paintDecoration(const PaintInfo& paintInfo,
|
| if (thickness <= 0)
|
| return;
|
|
|
| + const SimpleFontData* fontData = scaledFont.primaryFont();
|
| + DCHECK(fontData);
|
| + if (!fontData)
|
| + return;
|
| +
|
| float decorationOffset = baselineOffsetForDecoration(
|
| - decoration, scaledFont.getFontMetrics(), thickness);
|
| + decoration, fontData->getFontMetrics(), thickness);
|
| FloatPoint decorationOrigin(fragment.x,
|
| fragment.y - decorationOffset / scalingFactor);
|
|
|
| @@ -449,7 +454,11 @@ void SVGInlineTextBoxPainter::paintText(const PaintInfo& paintInfo,
|
| textRunPaintInfo.from = startPosition;
|
| textRunPaintInfo.to = endPosition;
|
|
|
| - float baseline = scaledFont.getFontMetrics().floatAscent();
|
| + const SimpleFontData* fontData = scaledFont.primaryFont();
|
| + DCHECK(fontData);
|
| + if (!fontData)
|
| + return;
|
| + float baseline = fontData->getFontMetrics().floatAscent();
|
| textRunPaintInfo.bounds = FloatRect(textOrigin.x(), textOrigin.y() - baseline,
|
| textSize.width(), textSize.height());
|
|
|
|
|