Source/WebCore/rendering/RootInlineBox.cpp - Issue 10796066: Merge 122883 - vertical-align: middle causes overflow with subpixel layout

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/RootInlineBox.cpp

Issue 10796066: Merge 122883 - vertical-align: middle causes overflow with subpixel layout (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/

Patch Set: Created 8 years, 5 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/RootInlineBox.cpp

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

--- Source/WebCore/rendering/RootInlineBox.cpp (revision 123234)

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

@@ -868,7 +868,7 @@

else if (verticalAlign == TEXT_TOP)

verticalPosition += renderer->baselinePosition(baselineType(), firstLine, lineDirection) - fontMetrics.ascent(baselineType());

else if (verticalAlign == MIDDLE)

- verticalPosition += -static_cast<int>(fontMetrics.xHeight() / 2) - renderer->lineHeight(firstLine, lineDirection) / 2 + renderer->baselinePosition(baselineType(), firstLine, lineDirection);

+ verticalPosition = (verticalPosition - static_cast<LayoutUnit>(fontMetrics.xHeight() / 2) - renderer->lineHeight(firstLine, lineDirection) / 2 + renderer->baselinePosition(baselineType(), firstLine, lineDirection)).round();

else if (verticalAlign == TEXT_BOTTOM) {

verticalPosition += fontMetrics.descent(baselineType());

// lineHeight - baselinePosition is always 0 for replaced elements (except inline blocks), so don't bother wasting time in that case.

« no previous file with comments | « Source/WebCore/ChangeLog ('k') | no next file » | no next file with comments »