Attachment 108893 Details for Bug 68933 – ROLLOUT of r96139

[patch] ROLLOUT of r96139

bug-68933-20110927211157.patch (text/plain), 10.64 KB, created by WebKit Review Bot on 2011-09-27 14:13:44 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Review Bot

Created: 2011-09-27 14:13:44 PDT

Size: 10.64 KB

patch

obsolete

>Subversion Revision: 96156
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 04c1117f6a656dc4e934e7372f0531834182d0a7..eaeb0c916b189051074bbbc26763b7a3bbad2cb1 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,15 @@
>+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>
> 
>         need to rebseline these once new aa-gdi-text code lands in skia
>diff --git a/LayoutTests/fast/replaced/table-percent-width-expected.txt b/LayoutTests/fast/replaced/table-percent-width-expected.txt
>deleted file mode 100644
>index e7f27fa4bd5c682b94eb163568dd09d4fa7b6858..0000000000000000000000000000000000000000
>--- a/LayoutTests/fast/replaced/table-percent-width-expected.txt
>+++ /dev/null
>@@ -1,25 +0,0 @@
>-
>-
>-
>-
>-
>-This test checks that a replaced element with percentage width (and no height specified) within a table cell is squeezed to the dimensions of the table cell.
>-See bug #29447.
>-
>-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>-
>-
>-PASS getWidth('img-1') is '105px'
>-PASS getHeight('img-1') is '105px'
>-PASS getWidth('img-2') is '98px'
>-PASS getHeight('img-2') is '98px'
>-PASS getWidth('img-3') is '40px'
>-PASS getHeight('img-3') is '40px'
>-PASS getWidth('img-4') is '36px'
>-PASS getHeight('img-4') is '36px'
>-PASS getWidth('img-5') is '40px'
>-PASS getHeight('img-5') is '36px'
>-PASS successfullyParsed is true
>-
>-TEST COMPLETE
>-
>diff --git a/LayoutTests/fast/replaced/table-percent-width.html b/LayoutTests/fast/replaced/table-percent-width.html
>deleted file mode 100644
>index 7f6df9b49aa78d26b98e49109a2466f22a7c424e..0000000000000000000000000000000000000000
>--- a/LayoutTests/fast/replaced/table-percent-width.html
>+++ /dev/null
>@@ -1,115 +0,0 @@
>-<html>
>-<head>
>-<title> webkit.org/b/29447: Replaced elements squeezed when width is specified as percentage inside a table with Auto layout</title>
>-<link rel="stylesheet" href="../js/resources/js-test-style.css">
>-<script src="../js/resources/js-test-pre.js"></script>
>-<script src="../js/resources/js-test-post-function.js"></script>
>-<script>
>-if (window.layoutTestController) {
>-    layoutTestController.waitUntilDone();
>-    layoutTestController.dumpAsText();
>-}
>-
>-function getComputedStyleForElement(element, cssPropertyName)
>-{
>-    if (!element) {
>-        return null;
>-    }
>-    if (window.getComputedStyle) {
>-        return window.getComputedStyle(element, '').getPropertyValue(cssPropertyName.replace(/([A-Z])/g, "-$1").toLowerCase());
>-    }
>-    if (element.currentStyle) {
>-        return element.currentStyle[cssPropertyName];
>-    }
>-    return null;
>-}
>-
>-function getWidth(id)
>-{
>-    return getComputedStyleForElement(document.getElementById(id), 'width');
>-}
>-
>-function getHeight(id)
>-{
>-    return getComputedStyleForElement(document.getElementById(id), 'height');
>-}
>-
>-function parsePixelValue(str)
>-{
>-    if (typeof str != "string" || str.length < 3 || str.substr(str.length - 2) != "px") {
>-        testFailed(str + " is unparsable.");
>-        return -1;
>-    }
>-    return parseFloat(str);
>-}
>-
>-function test()
>-{
>-    description("This test checks that a replaced element with percentage width (and no height specified) within a table cell is squeezed to the dimensions of the table cell.<br>See bug #29447.");
>-
>-    shouldBe("getWidth('img-1')", "'105px'");
>-    shouldBe("getHeight('img-1')", "'105px'");
>-    shouldBe("getWidth('img-2')", "'98px'");
>-    shouldBe("getHeight('img-2')", "'98px'");
>-    shouldBe("getWidth('img-3')", "'40px'");
>-    shouldBe("getHeight('img-3')", "'40px'");
>-    shouldBe("getWidth('img-4')", "'36px'");
>-    shouldBe("getHeight('img-4')", "'36px'");
>-    shouldBe("getWidth('img-5')", "'40px'");
>-    shouldBe("getHeight('img-5')", "'36px'");
>-
>-    isSuccessfullyParsed();
>-
>-    if (window.layoutTestController) {
>-        layoutTestController.notifyDone();
>-    }
>-}
>-
>-var successfullyParsed = true;
>-</script>
>-</head>
>-<body onload="test()">
>-   <table>
>-    <tr>
>-    <td>
>-      <img id="img-1" src="resources/square-blue-100x100.png" width="100%" align="LEFT" border="1">
>-    </td>
>-    </tr>
>-   </table>
>-
>-   <table>
>-    <tr>
>-    <td>
>-      <img id="img-2" src="resources/square-blue-100x100.png" height="100%" align="LEFT" border="1">
>-    </td>
>-    </tr>
>-   </table>
>-
>-   <table height="50" width="50" border="1">
>-    <tr>
>-    <td>
>-      <img id="img-3" src="resources/square-blue-100x100.png" width="100%" align="LEFT" border="1">
>-    </td>
>-    </tr>
>-   </table>
>-
>-   <table height="50" width="50" border="1">
>-    <tr>
>-    <td>
>-      <img id="img-4" src="resources/square-blue-100x100.png" height="100%" align="LEFT" border="1">
>-    </td>
>-    </tr>
>-   </table>
>-
>-   <table height="50" width="50" border="1">
>-    <tr>
>-    <td>
>-      <img id="img-5" src="resources/square-blue-100x100.png" width="100%" height="100%" align="LEFT" border="1">
>-    </td>
>-    </tr>
>-   </table>
>-
>-<p id="description"></p>
>-<div id="console"></div>
>-</body>
>-</html>
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 0a6aaada937089c672371960516548b738215823..39b5db1cbc2acc11e459bc6d0430b3363ab511bf 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+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>
> 
>         REGRESSION(65665): Pattern size being clamped to SVG size can prevent transformed elements from being fully covered by userSpaceOnUse patterns
>diff --git a/Source/WebCore/rendering/RenderBox.cpp b/Source/WebCore/rendering/RenderBox.cpp
>index dee3741099b033fe19fde64858d2d89a6797c0a0..5c8bee925c3af97b4b32fcee06a909b919d392f1 100644
>--- a/Source/WebCore/rendering/RenderBox.cpp
>+++ b/Source/WebCore/rendering/RenderBox.cpp
>@@ -1216,37 +1216,6 @@ LayoutRect RenderBox::clipRect(const LayoutPoint& location)
>     return clipRect;
> }
> 
>-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
> {
>     RenderBlock* cb = containingBlock();
>@@ -2045,7 +2014,7 @@ LayoutUnit RenderBox::computeReplacedLogicalWidthUsing(Length logicalWidth) cons
>             // FIXME: containingBlockLogicalWidthForContent() is wrong if the replaced element's block-flow is perpendicular to the
>             // 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));
>         }
>@@ -2105,11 +2074,14 @@ LayoutUnit RenderBox::computeReplacedLogicalHeightUsing(Length logicalHeight) co
>                 // table cells using percentage heights.
>                 // 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();
>                 }
>             }
>             return computeContentBoxLogicalHeight(logicalHeight.calcValue(availableHeight));
>diff --git a/Source/WebCore/rendering/RenderBox.h b/Source/WebCore/rendering/RenderBox.h
>index c27b0ce7739998da1351f05dc09ac90c6a83c473..45d4460ee485c3a1854f9360f6e84dcd5574adef 100644
>--- a/Source/WebCore/rendering/RenderBox.h
>+++ b/Source/WebCore/rendering/RenderBox.h
>@@ -290,7 +290,6 @@ public:
> 
>     virtual LayoutUnit containingBlockLogicalWidthForContent() const;
>     LayoutUnit perpendicularContainingBlockLogicalHeight() const;
>-    int containingBlockReplacedLogicalWidthForContent() const;
>     
>     virtual void computeLogicalWidth();
>     virtual void computeLogicalHeight();

Actions: View | Formatted Diff | Diff

Attachments on bug 68933: 108893