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

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

index 1bf8f99383b4750b86423529cb475880d4a7d2ab..76de7672f6fa11cd5ce43a18ecb88cb44087ff18 100644

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

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

@@ -155,7 +155,9 @@ void LayoutMenuList::styleDidChange(StyleDifference diff,

}

void LayoutMenuList::updateInnerBlockHeight() {

- m_innerBlockHeight = style()->getFontMetrics().height() +

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

+ DCHECK(fontData);

+ m_innerBlockHeight = (fontData ? fontData->getFontMetrics().height() : 0) +

m_innerBlock->borderAndPaddingHeight();

}