Changeset 96139 in webkit

Timestamp:

Sep 27, 2011, 12:31:31 PM (14 years ago)

Author:

robert@webkit.org

Message:

Reviewed by David Hyatt.

Replaced elements squeezed when width is specified as percentage inside a table with Auto layout
​https://bugs.webkit.org/show_bug.cgi?id=29447

Source/WebCore:

If inserting a 'replaced' element (e.g. image, plugin) in a table cell that is not descendant from
a block with fixed layout then do not squeeze the element, let it use its intrinsic width and height.

Test: fast/replaced/table-percent-width.html

• rendering/RenderBox.cpp:

(WebCore::avoidSqueezingWidth):
(WebCore::avoidSqueezingHeight):
(WebCore::RenderBox::containingBlockReplacedLogicalWidthForContent):
(WebCore::RenderBox::computeReplacedLogicalWidthUsing):
(WebCore::RenderBox::computeReplacedLogicalHeightUsing):

• rendering/RenderBox.h:

LayoutTests:

• fast/replaced/table-percent-width.html: Added.
• fast/replaced/table-percent-width-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/replaced/table-percent-width-expected.txt (added)
• LayoutTests/fast/replaced/table-percent-width.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (3 diffs)
• Source/WebCore/rendering/RenderBox.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-28  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by David Hyatt.
+
+        Replaced elements squeezed when width is specified as percentage inside a table with Auto layout
+        https://bugs.webkit.org/show_bug.cgi?id=29447
+
+        * fast/replaced/table-percent-width.html: Added.
+        * fast/replaced/table-percent-width-expected.txt: Added.
+
 2011-09-27  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-28  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by David Hyatt.
+
+        Replaced elements squeezed when width is specified as percentage inside a table with Auto layout
+        https://bugs.webkit.org/show_bug.cgi?id=29447
+
+        If inserting a 'replaced' element (e.g. image, plugin) in a table cell that is not descendant from
+        a block with fixed layout then do not squeeze the element, let it use its intrinsic width and height.
+
+        Test: fast/replaced/table-percent-width.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::avoidSqueezingWidth):
+        (WebCore::avoidSqueezingHeight):
+        (WebCore::RenderBox::containingBlockReplacedLogicalWidthForContent):
+        (WebCore::RenderBox::computeReplacedLogicalWidthUsing):
+        (WebCore::RenderBox::computeReplacedLogicalHeightUsing):
+        * rendering/RenderBox.h:
+
 2011-09-27  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -1217 +1217 @@
 }
 
+static bool avoidSqueezingWidth(RenderBlock* cb)
+{
+    while (cb && !cb->isRenderView()) {
+        if (!cb->style()->logicalWidth().isAuto() && !cb->style()->logicalWidth().isPercent())
+            return false;
+        cb = cb->containingBlock();
+    }
+    return true;
+}
+
+static bool avoidSqueezingHeight(RenderBlock* cb)
+{
+    while (cb && !cb->isRenderView()) {
+        if (!cb->style()->logicalHeight().isAuto() && !cb->style()->logicalHeight().isPercent())
+            return false;
+        cb = cb->containingBlock();
+    }
+    return true;
+}
+
+int RenderBox::containingBlockReplacedLogicalWidthForContent() const
+{
+    RenderBlock* cb = containingBlock();
+    // Don't let table cells squeeze percent-height replaced elements
+    // <http://bugs.webkit.org/show_bug.cgi?id=29447>
+    if (cb->isTableCell() && avoidSqueezingWidth(cb))
+        return max(shrinkToAvoidFloats() ? cb->availableLogicalWidthForLine(y(), false) : cb->availableLogicalWidth(), intrinsicLogicalWidth());
+
+    return containingBlockLogicalWidthForContent();
+}
+
 LayoutUnit RenderBox::containingBlockLogicalWidthForContent() const
 {
@@ -2015 +2046 @@
             // containing block's block-flow.
             // https://bugs.webkit.org/show_bug.cgi?id=46496
-            const LayoutUnit cw = isPositioned() ? containingBlockLogicalWidthForPositioned(toRenderBoxModelObject(container())) : containingBlockLogicalWidthForContent();
+            const LayoutUnit cw = isPositioned() ? containingBlockLogicalWidthForPositioned(toRenderBoxModelObject(container())) : containingBlockReplacedLogicalWidthForContent();
             if (cw > 0)
                 return computeContentBoxLogicalWidth(logicalWidth.calcMinValue(cw));
@@ -2075 +2106 @@
                 // FIXME: This needs to be made block-flow-aware.  If the cell and image are perpendicular block-flows, this isn't right.
                 // https://bugs.webkit.org/show_bug.cgi?id=46997
-                while (cb && !cb->isRenderView() && (cb->style()->logicalHeight().isAuto() || cb->style()->logicalHeight().isPercent())) {
-                    if (cb->isTableCell()) {
-                        // Don't let table cells squeeze percent-height replaced elements
-                        // <http://bugs.webkit.org/show_bug.cgi?id=15359>
-                        availableHeight = max(availableHeight, intrinsicLogicalHeight());
-                        return logicalHeight.calcValue(availableHeight - borderAndPaddingLogicalHeight());
-                    }
-                    cb = cb->containingBlock();
+                if (cb->isTableCell() && avoidSqueezingHeight(toRenderBlock(cb))) {
+                    // Don't let table cells squeeze percent-height replaced elements
+                    // <http://bugs.webkit.org/show_bug.cgi?id=15359>
+                    availableHeight = max(availableHeight, intrinsicLogicalHeight());
+                    return logicalHeight.calcValue(availableHeight - borderAndPaddingLogicalHeight());
                 }
             }

trunk/Source/WebCore/rendering/RenderBox.h

@@ -286 +286 @@
     virtual LayoutUnit containingBlockLogicalWidthForContent() const;
     LayoutUnit perpendicularContainingBlockLogicalHeight() const;
+    int containingBlockReplacedLogicalWidthForContent() const;
     
     virtual void computeLogicalWidth();