Changeset 85971 in webkit

Timestamp:

May 6, 2011 1:07:38 PM (13 years ago)

Author:

hyatt@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=60398 (<rdar://problem/9307696>)
REGRESSION (r81684?): cox.com sign in button is missing

Reviewed by Dan Bernstein.

Fix a typo in r81684 where the ascent was used in a comparison instead of boxHeight.
This restores the original behavior before the refactoring messed it up.

Source/WebCore:

Added fast/inline/nested-top-alignment.html

• rendering/InlineFlowBox.cpp:

(WebCore::InlineFlowBox::computeLogicalBoxHeights):

LayoutTests:

• fast/inline/nested-top-alignment.html: Added.
• platform/mac/fast/inline/nested-top-alignment-expected.png: Added.
• platform/mac/fast/inline/nested-top-alignment-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/inline/nested-top-alignment.html (added)
• LayoutTests/platform/mac/fast/inline/nested-top-alignment-expected.png (added)
• LayoutTests/platform/mac/fast/inline/nested-top-alignment-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/InlineFlowBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-06  David Hyatt  <hyatt@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=60398 (<rdar://problem/9307696>)
+        REGRESSION (r81684?): cox.com sign in button is missing
+        
+        Fix a typo in r81684 where the ascent was used in a comparison instead of boxHeight.
+        This restores the original behavior before the refactoring messed it up.
+
+        * fast/inline/nested-top-alignment.html: Added.
+        * platform/mac/fast/inline/nested-top-alignment-expected.png: Added.
+        * platform/mac/fast/inline/nested-top-alignment-expected.txt: Added.
+
 2011-05-06  Adrienne Walker  <enne@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-06  David Hyatt  <hyatt@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=60398 (<rdar://problem/9307696>)
+        REGRESSION (r81684?): cox.com sign in button is missing
+        
+        Fix a typo in r81684 where the ascent was used in a comparison instead of boxHeight.
+        This restores the original behavior before the refactoring messed it up.
+
+        Added fast/inline/nested-top-alignment.html
+
+        * rendering/InlineFlowBox.cpp:
+        (WebCore::InlineFlowBox::computeLogicalBoxHeights):
+
 2011-05-06  David Hyatt  <hyatt@apple.com>
 

trunk/Source/WebCore/rendering/InlineFlowBox.cpp

@@ -540 +540 @@
         int boxHeight = ascent + descent;
         if (curr->verticalAlign() == TOP) {
-            if (maxPositionTop < ascent)
+            if (maxPositionTop < boxHeight)
                 maxPositionTop = boxHeight;
         } else if (curr->verticalAlign() == BOTTOM) {