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

Unified Diff: third_party/WebKit/Source/core/layout/line/RootInlineBox.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/layout/line/RootInlineBox.cpp
diff --git a/third_party/WebKit/Source/core/layout/line/RootInlineBox.cpp b/third_party/WebKit/Source/core/layout/line/RootInlineBox.cpp
index 9bf22c9c05c3360e76e44af136ed5a617b5d8b6d..5a1625bd834369cafe32b5607a4076d726c8f8a7 100644
--- a/third_party/WebKit/Source/core/layout/line/RootInlineBox.cpp
+++ b/third_party/WebKit/Source/core/layout/line/RootInlineBox.cpp
@@ -730,7 +730,12 @@ LayoutUnit RootInlineBox::verticalPositionForBox(
if (verticalAlign != VerticalAlignBaseline) {
const Font& font = parent.style(firstLine)->font();
- const FontMetrics& fontMetrics = font.getFontMetrics();
+ const SimpleFontData* fontData = font.primaryFont();
+ DCHECK(fontData);
+ if (!fontData)
+ return LayoutUnit();
+
+ const FontMetrics& fontMetrics = fontData->getFontMetrics();
int fontSize = font.getFontDescription().computedPixelSize();
LineDirectionMode lineDirection =

Powered by Google App Engine
This is Rietveld 408576698