Source/WebCore/rendering/InlineFlowBox.cpp - Issue 6973064: Merge 85971 - https://bugs.webkit.org/show_bug.cgi?id=60398 (<rdar://problem/9307696>)

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: Source/WebCore/rendering/InlineFlowBox.cpp

Issue 6973064: Merge 85971 - https://bugs.webkit.org/show_bug.cgi?id=60398 (<rdar://problem/9307696>) (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/742/

Patch Set: Created 9 years, 7 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: Source/WebCore/rendering/InlineFlowBox.cpp

===================================================================

--- Source/WebCore/rendering/InlineFlowBox.cpp (revision 86469)

+++ Source/WebCore/rendering/InlineFlowBox.cpp (working copy)

@@ -539,7 +539,7 @@

int boxHeight = ascent + descent;

if (curr->verticalAlign() == TOP) {

- if (maxPositionTop < ascent)

+ if (maxPositionTop < boxHeight)

maxPositionTop = boxHeight;

} else if (curr->verticalAlign() == BOTTOM) {

if (maxPositionBottom < boxHeight)

« no previous file with comments | « LayoutTests/platform/mac/fast/inline/nested-top-alignment-expected.txt ('k') | no next file » | no next file with comments »