Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(262)

Unified Diff: Source/WebCore/rendering/InlineFlowBox.cpp

Issue 7018002: 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
« no previous file with comments | « LayoutTests/platform/mac/fast/inline/nested-top-alignment-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/InlineFlowBox.cpp
===================================================================
--- Source/WebCore/rendering/InlineFlowBox.cpp (revision 86491)
+++ 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 »

Powered by Google App Engine
This is Rietveld 408576698