Changeset 96157 in webkit

Timestamp:

Sep 27, 2011 2:19:16 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r96139.
​http://trac.webkit.org/changeset/96139
​https://bugs.webkit.org/show_bug.cgi?id=68933

Broke table-percent-height.html on Mac bots (Requested by
mwenge2 on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2011-09-27

Source/WebCore:

• rendering/RenderBox.cpp:

(WebCore::RenderBox::computeReplacedLogicalWidthUsing):
(WebCore::RenderBox::computeReplacedLogicalHeightUsing):

• rendering/RenderBox.h:

LayoutTests:

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/replaced/table-percent-width-expected.txt (deleted)
• LayoutTests/fast/replaced/table-percent-width.html (deleted)
• 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-09-27  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r96139.
+        http://trac.webkit.org/changeset/96139
+        https://bugs.webkit.org/show_bug.cgi?id=68933
+
+        Broke table-percent-height.html on Mac bots (Requested by
+        mwenge2 on #webkit).
+
+        * fast/replaced/table-percent-width-expected.txt: Removed.
+        * fast/replaced/table-percent-width.html: Removed.
+
 2011-09-27  Mike Reed  <reed@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-27  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r96139.
+        http://trac.webkit.org/changeset/96139
+        https://bugs.webkit.org/show_bug.cgi?id=68933
+
+        Broke table-percent-height.html on Mac bots (Requested by
+        mwenge2 on #webkit).
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::computeReplacedLogicalWidthUsing):
+        (WebCore::RenderBox::computeReplacedLogicalHeightUsing):
+        * rendering/RenderBox.h:
+
 2011-09-27  Tim Horton  <timothy_horton@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
 {
@@ -2046 +2015 @@
             // containing block's block-flow.
             // https://bugs.webkit.org/show_bug.cgi?id=46496
-            const LayoutUnit cw = isPositioned() ? containingBlockLogicalWidthForPositioned(toRenderBoxModelObject(container())) : containingBlockReplacedLogicalWidthForContent();
+            const LayoutUnit cw = isPositioned() ? containingBlockLogicalWidthForPositioned(toRenderBoxModelObject(container())) : containingBlockLogicalWidthForContent();
             if (cw > 0)
                 return computeContentBoxLogicalWidth(logicalWidth.calcMinValue(cw));
@@ -2106 +2075 @@
                 // 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
-                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());
+                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();
                 }
             }

trunk/Source/WebCore/rendering/RenderBox.h

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