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

Unified Diff: third_party/WebKit/Source/core/paint/EllipsisBoxPainter.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/EllipsisBoxPainter.cpp
diff --git a/third_party/WebKit/Source/core/paint/EllipsisBoxPainter.cpp b/third_party/WebKit/Source/core/paint/EllipsisBoxPainter.cpp
index 021f5bc139726fa1eda85bdcd060b6e5358714ee..28aa709df01e5335825544505bf5728f406cd49b 100644
--- a/third_party/WebKit/Source/core/paint/EllipsisBoxPainter.cpp
+++ b/third_party/WebKit/Source/core/paint/EllipsisBoxPainter.cpp
@@ -58,13 +58,17 @@ void EllipsisBoxPainter::paintEllipsis(const PaintInfo& paintInfo,
context.concatCTM(TextPainter::rotation(boxRect, TextPainter::Clockwise));
const Font& font = style.font();
+ const SimpleFontData* fontData = font.primaryFont();
+ DCHECK(fontData);
+ if (!fontData)
+ return;
TextPainter::Style textStyle = TextPainter::textPaintingStyle(
m_ellipsisBox.getLineLayoutItem(), style, paintInfo);
TextRun textRun = constructTextRun(font, m_ellipsisBox.ellipsisStr(), style,
TextRun::AllowTrailingExpansion);
LayoutPoint textOrigin(boxOrigin.x(),
- boxOrigin.y() + font.getFontMetrics().ascent());
+ boxOrigin.y() + fontData->getFontMetrics().ascent());
TextPainter textPainter(context, font, textRun, textOrigin, boxRect,
m_ellipsisBox.isHorizontal());
textPainter.paint(0, m_ellipsisBox.ellipsisStr().length(),

Powered by Google App Engine
This is Rietveld 408576698