Changeset 29553 in webkit

Timestamp:

Jan 16, 2008 10:20:16 PM (16 years ago)

Author:

hyatt@apple.com

Message:

WebCore:

Fix for ​http://bugs.webkit.org/show_bug.cgi?id=16611

Make sure vertical-align length values are offset from their parents rather than being absolute to the
line.

Reviewed by olliej

Added fast/css/vertical-align-lengths.html

• rendering/RenderObject.cpp: (WebCore::RenderObject::getVerticalPosition):

LayoutTests:

Fix for ​http://bugs.webkit.org/show_bug.cgi?id=16611

Reviewed by olliej

• ChangeLog:
• fast/css/vertical-align-lengths.html: Added.
• platform/mac/fast/css/vertical-align-lengths-expected.checksum: Added.
• platform/mac/fast/css/vertical-align-lengths-expected.png: Added.
• platform/mac/fast/css/vertical-align-lengths-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/vertical-align-lengths.html (added)
• LayoutTests/platform/mac/fast/css/vertical-align-lengths-expected.checksum (added)
• LayoutTests/platform/mac/fast/css/vertical-align-lengths-expected.png (added)
• LayoutTests/platform/mac/fast/css/vertical-align-lengths-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderObject.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-01-16  David Hyatt  <hyatt@apple.com>
+
+       Fix for http://bugs.webkit.org/show_bug.cgi?id=16611
+
+       Reviewed by olliej
+
+        * ChangeLog:
+        * fast/css/vertical-align-lengths.html: Added.
+        * platform/mac/fast/css/vertical-align-lengths-expected.checksum: Added.
+        * platform/mac/fast/css/vertical-align-lengths-expected.png: Added.
+        * platform/mac/fast/css/vertical-align-lengths-expected.txt: Added.
+
 2008-01-16  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-01-16  David Hyatt  <hyatt@apple.com>
+
+        Fix for http://bugs.webkit.org/show_bug.cgi?id=16611
+
+        Make sure vertical-align length values are offset from their parents rather than being absolute to the
+        line.
+
+        Reviewed by olliej
+
+        Added fast/css/vertical-align-lengths.html
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::getVerticalPosition):
+
 2008-01-16  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/rendering/RenderObject.cpp

@@ -2688 +2688 @@
     else if (va == BOTTOM)
         vpos = PositionBottom;
-    else if (va == LENGTH)
-        vpos = -style()->verticalAlignLength().calcValue(lineHeight(firstLine));
     else {
         bool checkParent = parent()->isInline() && !parent()->isInlineBlockOrInlineTable() && parent()->style()->verticalAlign() != TOP && parent()->style()->verticalAlign() != BOTTOM;
@@ -2714 +2712 @@
         } else if (va == BASELINE_MIDDLE)
             vpos += -lineHeight(firstLine) / 2 + baselinePosition(firstLine);
+        else if (va == LENGTH)
+            vpos -= style()->verticalAlignLength().calcValue(lineHeight(firstLine));
     }