Changeset 128389 in webkit

Timestamp:

Sep 12, 2012 5:30:07 PM (12 years ago)

Author:

jchaffraix@webkit.org

Message:

REGRESSION(r122501): replaced elements with percent width are wrongly size when inserted inside an auto-table layout
​https://bugs.webkit.org/show_bug.cgi?id=95892

Reviewed by Ojan Vafai.

Source/WebCore:

r122501 exposed an issue in how preferred logical widths are computed on replaced objects. The code relies on the
logical width computation methods. Unfortunately the previous code relies on the layout information, which may not
be up-to-date during preferred logical width computation.

Test: fast/table/bad-replaced-sizing-preferred-logical-widths.html

fast/replaced/vertical-writing-mode-max-logical-width.html

• rendering/RenderReplaced.cpp:

(WebCore::RenderReplaced::computeMaxPreferredLogicalWidth):
Added this helper method. The main difference with the old code is that it handles the percent logical width
properly before calling the old code path. This is not totally right but before forking the whole code, it's
better to have more evidence that forking preferred logical widths and logical width computation is the way to go.

(WebCore::RenderReplaced::computePreferredLogicalWidths):
Changed to call computeMaxPreferredLogicalWidth. Also fixed an existing bug in vertical-writing modes where we would
add the wrong paddings and borders.

• rendering/RenderReplaced.h:

(RenderReplaced): Added computeMaxPreferredLogicalWidth.

LayoutTests:

• fast/replaced/vertical-writing-mode-max-logical-width-replaced-expected.txt: Added.
• fast/replaced/vertical-writing-mode-max-logical-width-replaced.html: Added.
• fast/table/bad-replaced-sizing-preferred-logical-widths-expected.txt: Added.
• fast/table/bad-replaced-sizing-preferred-logical-widths.html: Added.
• fast/table/resources/iframe.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/replaced/vertical-writing-mode-max-logical-width-replaced-expected.txt (added)
• LayoutTests/fast/replaced/vertical-writing-mode-max-logical-width-replaced.html (added)
• LayoutTests/fast/table/bad-replaced-sizing-preferred-logical-widths-expected.txt (added)
• LayoutTests/fast/table/bad-replaced-sizing-preferred-logical-widths.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderReplaced.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderReplaced.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-09-12  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        REGRESSION(r122501): replaced elements with percent width are wrongly size when inserted inside an auto-table layout
+        https://bugs.webkit.org/show_bug.cgi?id=95892
+
+        Reviewed by Ojan Vafai.
+
+        * fast/replaced/vertical-writing-mode-max-logical-width-replaced-expected.txt: Added.
+        * fast/replaced/vertical-writing-mode-max-logical-width-replaced.html: Added.
+        * fast/table/bad-replaced-sizing-preferred-logical-widths-expected.txt: Added.
+        * fast/table/bad-replaced-sizing-preferred-logical-widths.html: Added.
+        * fast/table/resources/iframe.html: Added.
+
 2012-09-12  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-12  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        REGRESSION(r122501): replaced elements with percent width are wrongly size when inserted inside an auto-table layout
+        https://bugs.webkit.org/show_bug.cgi?id=95892
+
+        Reviewed by Ojan Vafai.
+
+        r122501 exposed an issue in how preferred logical widths are computed on replaced objects. The code relies on the
+        logical width computation methods. Unfortunately the previous code relies on the layout information, which may not
+        be up-to-date during preferred logical width computation.
+
+        Test: fast/table/bad-replaced-sizing-preferred-logical-widths.html
+              fast/replaced/vertical-writing-mode-max-logical-width.html
+
+        * rendering/RenderReplaced.cpp:
+        (WebCore::RenderReplaced::computeMaxPreferredLogicalWidth):
+        Added this helper method. The main difference with the old code is that it handles the percent logical width
+        properly before calling the old code path. This is not totally right but before forking the whole code, it's
+        better to have more evidence that forking preferred logical widths and logical width computation is the way to go.
+
+        (WebCore::RenderReplaced::computePreferredLogicalWidths):
+        Changed to call computeMaxPreferredLogicalWidth. Also fixed an existing bug in vertical-writing modes where we would
+        add the wrong paddings and borders.
+
+        * rendering/RenderReplaced.h:
+        (RenderReplaced): Added computeMaxPreferredLogicalWidth.
+
 2012-09-12  Max Vujovic  <mvujovic@adobe.com>
 

trunk/Source/WebCore/rendering/RenderReplaced.cpp

@@ -438 +438 @@
 }
 
+LayoutUnit RenderReplaced::computeMaxPreferredLogicalWidth() const
+{
+    Length logicalWidth = style()->logicalWidth();
+
+    // We cannot resolve any percent logical width here as the available logical
+    // width may not be set on our containing block.
+    if (logicalWidth.isPercent())
+        return intrinsicLogicalWidth();
+
+    // FIXME: We shouldn't be calling a logical width computing function in preferred
+    // logical widths computation as the layout information is probably invalid.
+    return computeReplacedLogicalWidth(false);
+}
+
 void RenderReplaced::computePreferredLogicalWidths()
 {
     ASSERT(preferredLogicalWidthsDirty());
 
-    LayoutUnit borderAndPadding = borderAndPaddingWidth();
-    m_maxPreferredLogicalWidth = computeReplacedLogicalWidth(false) + borderAndPadding;
+    LayoutUnit borderAndPadding = borderAndPaddingLogicalWidth();
+    m_maxPreferredLogicalWidth = computeMaxPreferredLogicalWidth() + borderAndPadding;
 
     if (style()->maxWidth().isFixed())

trunk/Source/WebCore/rendering/RenderReplaced.h

@@ -68 +68 @@
     virtual bool canHaveChildren() const { return false; }
 
+    LayoutUnit computeMaxPreferredLogicalWidth() const;
     virtual void computePreferredLogicalWidths();
     virtual void paintReplaced(PaintInfo&, const LayoutPoint&) { }