Changeset 148453 in webkit

Timestamp:

Apr 15, 2013 11:23:37 AM (11 years ago)

Author:

robert@webkit.org

Message:

An inline element with an absolutely positioned child does not correctly calculate/render padding and margin
​https://bugs.webkit.org/show_bug.cgi?id=47554

Reviewed by David Hyatt.

Source/WebCore:

When looking for padding/margin to add from the start of a child's parent skip past any leading positioned siblings as
we don't add the padding/margin of the common parent when skipping past them in |skipLeadingWhitespace|. We
don't need to worry about the case of trailing positioned objects as we will account for their parent's
border/margin/padding when we encounter them in |nextSegmentBreak|.

Test: fast/inline/padding-before-leading-positioned-element-contributes-width.html

• rendering/RenderBlockLineLayout.cpp:

(WebCore::previousInFlowSibling):
(WebCore):
(WebCore::inlineLogicalWidth):

LayoutTests:

• fast/inline/padding-before-leading-positioned-element-contributes-width-expected.txt: Added.
• fast/inline/padding-before-leading-positioned-element-contributes-width.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/inline/padding-before-leading-positioned-element-contributes-width-expected.txt (added)
• LayoutTests/fast/inline/padding-before-leading-positioned-element-contributes-width.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-04-15  Robert Hogan  <robert@webkit.org>
+
+        An inline element with an absolutely positioned child does not correctly calculate/render padding and margin
+        https://bugs.webkit.org/show_bug.cgi?id=47554
+
+        Reviewed by David Hyatt.
+
+        * fast/inline/padding-before-leading-positioned-element-contributes-width-expected.txt: Added.
+        * fast/inline/padding-before-leading-positioned-element-contributes-width.html: Added.
+
 2013-04-15  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-15  Robert Hogan  <robert@webkit.org>
+
+        An inline element with an absolutely positioned child does not correctly calculate/render padding and margin
+        https://bugs.webkit.org/show_bug.cgi?id=47554
+
+        Reviewed by David Hyatt.
+
+        When looking for padding/margin to add from the start of a child's parent skip past any leading positioned siblings as 
+        we don't add the padding/margin of the common parent when skipping past them in |skipLeadingWhitespace|. We
+        don't need to worry about the case of trailing positioned objects as we will account for their parent's
+        border/margin/padding when we encounter them in |nextSegmentBreak|.
+
+        Test: fast/inline/padding-before-leading-positioned-element-contributes-width.html
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::previousInFlowSibling):
+        (WebCore):
+        (WebCore::inlineLogicalWidth):
+
 2013-04-15  peavo@outlook.com  <peavo@outlook.com>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -351 +351 @@
 }
 
+static RenderObject* previousInFlowSibling(RenderObject* child)
+{
+    child = child->previousSibling();
+    while (child && child->isOutOfFlowPositioned())
+        child = child->previousSibling();
+    return child;
+}
+
 static LayoutUnit inlineLogicalWidth(RenderObject* child, bool start = true, bool end = true)
 {
@@ -359 +367 @@
         RenderInline* parentAsRenderInline = toRenderInline(parent);
         if (!isEmptyInline(parentAsRenderInline)) {
-            if (start && shouldAddBorderPaddingMargin(child->previousSibling(), start))
+            if (start && shouldAddBorderPaddingMargin(previousInFlowSibling(child), start))
                 extraWidth += borderPaddingMarginStart(parentAsRenderInline);
             if (end && shouldAddBorderPaddingMargin(child->nextSibling(), end))