Changeset 117413 in webkit

Timestamp:

May 17, 2012 1:18:59 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

REGRESSION (r116331): RSS Headlines/links are missing (-webkit-box-flex broken?)
​https://bugs.webkit.org/show_bug.cgi?id=85991

Source/WebCore:

Fix for regression failures on deprecated flex box test cases.

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

Test: fast/css/deprecated-flex-box-zero-width-intrinsic-max-width.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::computePreferredLogicalWidths):
Fix to use intrinsic width when the fixed width:0 , for deprecated flex boxes.

LayoutTests:

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

• fast/css/deprecated-flex-box-zero-width-intrinsic-max-width-expected.txt: Added.
• fast/css/deprecated-flex-box-zero-width-intrinsic-max-width.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/deprecated-flex-box-zero-width-intrinsic-max-width-expected.txt (added)
• LayoutTests/fast/css/deprecated-flex-box-zero-width-intrinsic-max-width.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-17  Pravin D  <pravind.2k4@gmail.com>
+
+        REGRESSION (r116331): RSS Headlines/links are missing (-webkit-box-flex broken?)
+        https://bugs.webkit.org/show_bug.cgi?id=85991
+
+        Reviewed by Eric Seidel.
+
+        * fast/css/deprecated-flex-box-zero-width-intrinsic-max-width-expected.txt: Added.
+        * fast/css/deprecated-flex-box-zero-width-intrinsic-max-width.html: Added.
+
 2012-05-17  Uday Kiran  <udaykiran@motorola.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-17  Pravin D  <pravind.2k4@gmail.com>
+
+        REGRESSION (r116331): RSS Headlines/links are missing (-webkit-box-flex broken?)
+        https://bugs.webkit.org/show_bug.cgi?id=85991
+
+        Fix for regression failures on deprecated flex box test cases. 
+
+        Reviewed by Eric Seidel.
+
+        Test: fast/css/deprecated-flex-box-zero-width-intrinsic-max-width.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::computePreferredLogicalWidths):
+        Fix to use intrinsic width when the fixed width:0 , for deprecated flex boxes.
+
 2012-05-17  Uday Kiran  <udaykiran@motorola.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -5175 +5175 @@
 
     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 && !(isDeprecatedFlexItem() && !styleToUse->logicalWidth().intValue()))
         m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = computeContentBoxLogicalWidth(styleToUse->logicalWidth().value());
     else {