third_party/WebKit/Source/core/layout/LayoutBox.cpp - Issue 2416033003: Remove unsafe getFontMetrics methods

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/layout/LayoutBox.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:

Index: third_party/WebKit/Source/core/layout/LayoutBox.cpp

diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp

index 6c86ce92d863e140f42445988c3325b06ed7d0c0..f105edc2825663bfd538fe22d6e9d6e55f7c2184 100644

--- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp

@@ -4531,7 +4531,9 @@ LayoutRect LayoutBox::localCaretRect(InlineBox* box,

// giant tall-as-window insertion point

// FIXME: ignoring :first-line, missing good reason to take care of

- LayoutUnit fontHeight = LayoutUnit(style()->getFontMetrics().height());

+ const SimpleFontData* fontData = style()->font().primaryFont();

+ LayoutUnit fontHeight =

+ LayoutUnit(fontData ? fontData->getFontMetrics().height() : 0);

if (fontHeight > rect.height() || (!isAtomicInlineLevel() && !isTable()))

rect.setHeight(fontHeight);