Changeset 113584 in webkit

Timestamp:

Apr 9, 2012 9:34:46 AM (12 years ago)

Author:

robert@webkit.org

Message:

REGRESSION (r94492): Incorrect initial layout of absolutely positioned <input> inside centering div
​https://bugs.webkit.org/show_bug.cgi?id=77754

Reviewed by David Hyatt.

Source/WebCore:

The correct static position of an center-aligned, inline, absolutely positioned object with a block child can't be known
until the width of the child has been computed. This means that setStaticPositions() in RenderBlockLineLayout is setting
the position too early, before the width of the child has been finalised. To fix, adjust the static position of the inline
positioned object once its child's width has been calculated.

Test: fast/css/align-positioned-object-on-resize.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::layoutPositionedObjects):

LayoutTests:

• fast/css/align-positioned-object-on-resize-expected.txt: Added.
• fast/css/align-positioned-object-on-resize.html: Added.
• platform/qt/Skipped: Skipped on Qt as window.resizeTo() does not work properly in Qt DRT.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/align-positioned-object-on-resize-expected.txt (added)
• LayoutTests/fast/css/align-positioned-object-on-resize.html (added)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-30  Robert Hogan  <robert@webkit.org>
+
+        REGRESSION (r94492): Incorrect initial layout of absolutely positioned <input> inside centering div
+        https://bugs.webkit.org/show_bug.cgi?id=77754
+
+        Reviewed by David Hyatt.
+
+        * fast/css/align-positioned-object-on-resize-expected.txt: Added.
+        * fast/css/align-positioned-object-on-resize.html: Added.
+        * platform/qt/Skipped: Skipped on Qt as window.resizeTo() does not work properly in Qt DRT.
+
 2012-04-09  Eric Carlson  <eric.carlson@apple.com>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -2577 +2577 @@
 # https://bugs.webkit.org/show_bug.cgi?id=83133
 fast/workers/worker-multi-startup.html
+
+# https://bugs.webkit.org/show_bug.cgi?id=77754
+# window.resizeTo() does not work properly in Qt DRT. The outerWidth changes after a resizeTo()
+# but not the innerWidth
+fast/css/align-positioned-object-on-resize.html

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-30  Robert Hogan  <robert@webkit.org>
+
+        REGRESSION (r94492): Incorrect initial layout of absolutely positioned <input> inside centering div
+        https://bugs.webkit.org/show_bug.cgi?id=77754
+
+        Reviewed by David Hyatt.
+
+        The correct static position of an center-aligned, inline, absolutely positioned object with a block child can't be known
+        until the width of the child has been computed. This means that setStaticPositions() in RenderBlockLineLayout is setting
+        the position too early, before the width of the child has been finalised. To fix, adjust the static position of the inline
+        positioned object once its child's width has been calculated.
+
+        Test: fast/css/align-positioned-object-on-resize.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::layoutPositionedObjects):
+
 2012-04-09  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -2495 +2495 @@
             oldLogicalTop = logicalTopForChild(r);
         }
-            
+        
         r->layoutIfNeeded();
-        
+
+        // Adjust the static position of a center-aligned inline positioned object with a block child now that the child's width has been computed.
+        if (!r->parent()->isRenderView() && r->parent()->isRenderBlock() && r->firstChild() && r->style()->position() == AbsolutePosition
+            && r->style()->isOriginalDisplayInlineType() && (r->style()->textAlign() == CENTER || r->style()->textAlign() == WEBKIT_CENTER)) {
+            RenderBlock* block = toRenderBlock(r->parent());
+            LayoutUnit blockHeight = block->logicalHeight();
+            block->setStaticInlinePositionForChild(r, blockHeight, block->startAlignedOffsetForLine(r, blockHeight, false));
+        }
+
         // Lay out again if our estimate was wrong.
         if (needsBlockDirectionLocationSetBeforeLayout && logicalTopForChild(r) != oldLogicalTop) {