Changeset 122501 in webkit

Timestamp:

Jul 12, 2012 1:48:39 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Percentage width replaced element in zero percent/fixed width container block incorrectly rendered.
​https://bugs.webkit.org/show_bug.cgi?id=9493

Patch by Pravin D <​pravind.2k4@gmail.com> on 2012-07-12
Reviewed by Andy Estes.

Source/WebCore:

When the width of the container is zero percent/fixed value then the width of the replaced element must also be zero.

Test: fast/css/percent-width-img-inside-zero-percent-and-fixed-container.html

• rendering/RenderBox.cpp:

(WebCore::RenderBox::computeReplacedLogicalWidthUsing):

When the containing block's available width is zero there can be two cases.
The containing block is floated/positioned in which case the width of the replaced child element must be its instrinsic width.
On the other hand if the width of the container is specified to be either zero percent or fixed value then the width of the
replaced elment must be zero.

LayoutTests:

• fast/css/percent-width-img-inside-zero-percent-and-fixed-container-expected.html: Added.
• fast/css/percent-width-img-inside-zero-percent-and-fixed-container.html: Added.
• fast/css/resources/red-box.png: Added. Image resource file for the test case.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/percent-width-img-inside-zero-percent-and-fixed-container-expected.html (added)
• LayoutTests/fast/css/percent-width-img-inside-zero-percent-and-fixed-container.html (added)
• LayoutTests/fast/css/resources/red-box.png (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-12  Pravin D  <pravind.2k4@gmail.com>
+
+        Percentage width replaced element in zero percent/fixed width container block incorrectly rendered.
+        https://bugs.webkit.org/show_bug.cgi?id=9493
+
+        Reviewed by Andy Estes.
+
+        * fast/css/percent-width-img-inside-zero-percent-and-fixed-container-expected.html: Added.
+        * fast/css/percent-width-img-inside-zero-percent-and-fixed-container.html: Added.
+        * fast/css/resources/red-box.png: Added.
+          Image resource file for the test case.
+
 2012-07-12  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-12  Pravin D  <pravind.2k4@gmail.com>
+
+        Percentage width replaced element in zero percent/fixed width container block incorrectly rendered.
+        https://bugs.webkit.org/show_bug.cgi?id=9493
+
+        Reviewed by Andy Estes.
+
+        When the width of the container is zero percent/fixed value then the width of the replaced element must also be zero.
+
+        Test: fast/css/percent-width-img-inside-zero-percent-and-fixed-container.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::computeReplacedLogicalWidthUsing):
+          When the containing block's available width is zero there can be two cases.
+          The containing block is floated/positioned in which case the width of the replaced child element must be its instrinsic width.
+          On the other hand if the width of the container is specified to be either zero percent or fixed value then the width of the
+          replaced elment must be zero.
+
 2012-07-11  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -2206 +2206 @@
             // https://bugs.webkit.org/show_bug.cgi?id=46496
             const LayoutUnit cw = isOutOfFlowPositioned() ? containingBlockLogicalWidthForPositioned(toRenderBoxModelObject(container())) : containingBlockLogicalWidthForContent();
-            if (cw > 0)
+            Length containerLogicalWidth = containingBlock()->style()->logicalWidth();
+            // FIXME: Handle cases when containing block width is calculated or viewport percent.
+            // https://bugs.webkit.org/show_bug.cgi?id=91071
+            if (cw > 0 || (!cw && (containerLogicalWidth.isFixed() || containerLogicalWidth.isPercent())))
                 return computeContentBoxLogicalWidth(minimumValueForLength(logicalWidth, cw));
         }