third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h - 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/line/BreakingContextInlineHeaders.h

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

« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutTextControl.cpp ('k') | third_party/WebKit/Source/core/layout/line/InlineBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h

diff --git a/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h b/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h

index e8d3640237bfe637097e2f0b0531186e570902c3..6b113b37c48a63c08456de84162e9e180694b174 100644

--- a/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h

+++ b/third_party/WebKit/Source/core/layout/line/BreakingContextInlineHeaders.h

@@ -253,11 +253,7 @@ inline bool requiresLineBoxForContent(LineLayoutInline flow,

(flow.style(lineInfo.isFirstLine())->lineHeight() !=

parent.style(lineInfo.isFirstLine())->lineHeight() ||

flow.style()->verticalAlign() != parent.style()->verticalAlign() ||

- !parent.style()

- ->font()

- .getFontMetrics()

- .hasIdenticalAscentDescentAndLineGap(

- flow.style()->font().getFontMetrics())))

+ !parent.style()->hasIdenticalAscentDescentAndLineGap(flow.styleRef())))

return true;

return false;

}