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

Unified Diff: third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp

Issue 2416033003: Remove unsafe getFontMetrics methods (Closed)
Patch Set: Address wkroman suggestions Created 4 years, 2 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
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());
« no previous file with comments | « third_party/WebKit/Source/core/paint/ListMarkerPainter.cpp ('k') | third_party/WebKit/Source/core/paint/TextPainter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698