Changeset 116331 in webkit

Timestamp:

May 7, 2012 11:41:08 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Wrong positioning due to wrong width calculation wrt width:0
​https://bugs.webkit.org/show_bug.cgi?id=50135

Patch by Pravin D <​pravind.2k4@gmail.com> on 2012-05-07
Reviewed by Eric Seidel.

Source/WebCore:

Test: fast/block/block-parent-with-zero-width-child.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::computePreferredLogicalWidths):
When width is fixed, the specified width must be taken, provided the value is positive.
Width=0 case was being ignored.

LayoutTests:

• fast/block/block-parent-with-zero-width-child-expected.txt: Added.
• fast/block/block-parent-with-zero-width-child.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/block-parent-with-zero-width-child-expected.txt (added)
• LayoutTests/fast/block/block-parent-with-zero-width-child.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-07  Pravin D  <pravind.2k4@gmail.com>
+
+        Wrong positioning due to wrong width calculation wrt width:0
+        https://bugs.webkit.org/show_bug.cgi?id=50135
+
+        Reviewed by Eric Seidel.
+
+        * fast/block/block-parent-with-zero-width-child-expected.txt: Added.
+        * fast/block/block-parent-with-zero-width-child.html: Added.
+
 2012-05-07  Dominik Röttsches  <dominik.rottsches@linux.intel.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-07  Pravin D  <pravind.2k4@gmail.com>
+
+        Wrong positioning due to wrong width calculation wrt width:0
+        https://bugs.webkit.org/show_bug.cgi?id=50135
+
+        Reviewed by Eric Seidel.
+
+        Test: fast/block/block-parent-with-zero-width-child.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::computePreferredLogicalWidths):
+        When width is fixed, the specified width must be taken, provided the value is positive.
+        Width=0 case was being ignored.
+
 2012-05-07  Noel Gordon  <noel.gordon@gmail.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -5161 +5161 @@
 
     RenderStyle* styleToUse = style();
-    if (!isTableCell() && styleToUse->logicalWidth().isFixed() && styleToUse->logicalWidth().value() > 0 && style()->marqueeBehavior() != MALTERNATE)
+    if (!isTableCell() && styleToUse->logicalWidth().isFixed() && styleToUse->logicalWidth().value() >= 0 && style()->marqueeBehavior() != MALTERNATE)
         m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = computeContentBoxLogicalWidth(styleToUse->logicalWidth().value());
     else {