third_party/WebKit/Source/core/layout/LayoutListBox.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/LayoutListBox.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/LayoutListBox.cpp

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

index 807d2266555478232eb8a169efd1616765c2efe8..7388ff3e1b80bd24322a524675e94ae7d806d8b2 100644

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

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

@@ -66,7 +66,10 @@ unsigned LayoutListBox::size() const {

}

LayoutUnit LayoutListBox::defaultItemHeight() const {

- return LayoutUnit(style()->getFontMetrics().height() + defaultPaddingBottom);

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

+ if (!fontData)

+ return LayoutUnit();

+ return LayoutUnit(fontData->getFontMetrics().height() + defaultPaddingBottom);

}

LayoutUnit LayoutListBox::itemHeight() const {