Title: [117413] trunk
- Revision
- 117413
- Author
- commit-qu...@webkit.org
- Date
- 2012-05-17 01:18:59 -0700 (Thu, 17 May 2012)
Log 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....@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....@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.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (117412 => 117413)
--- trunk/LayoutTests/ChangeLog 2012-05-17 08:14:33 UTC (rev 117412)
+++ trunk/LayoutTests/ChangeLog 2012-05-17 08:18:59 UTC (rev 117413)
@@ -1,3 +1,13 @@
+2012-05-17 Pravin D <pravind....@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 <udayki...@motorola.com>
CSS3 Multicolumn: Content in normal flow extending into column gaps should be clipped at middle of column-gap
Added: trunk/LayoutTests/fast/css/deprecated-flex-box-zero-width-intrinsic-max-width-expected.txt (0 => 117413)
--- trunk/LayoutTests/fast/css/deprecated-flex-box-zero-width-intrinsic-max-width-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/deprecated-flex-box-zero-width-intrinsic-max-width-expected.txt 2012-05-17 08:18:59 UTC (rev 117413)
@@ -0,0 +1,10 @@
+Tests if the Deprecated Flex boxes with max-width: intrinsic and width:0 has non-zero calculated width
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS flexBoxDiv.width is non-zero.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/fast/css/deprecated-flex-box-zero-width-intrinsic-max-width.html (0 => 117413)
--- trunk/LayoutTests/fast/css/deprecated-flex-box-zero-width-intrinsic-max-width.html (rev 0)
+++ trunk/LayoutTests/fast/css/deprecated-flex-box-zero-width-intrinsic-max-width.html 2012-05-17 08:18:59 UTC (rev 117413)
@@ -0,0 +1,30 @@
+<head>
+<title>Test case for bug https://bugs.webkit.org/show_bug.cgi?id=85991</title>
+<script src=""
+</head>
+<style>
+#outer {
+ display: -webkit-box;
+}
+#inner {
+ overflow: hidden;
+ max-width: intrinsic;
+ width: 0px;
+ -webkit-box-flex: 60;
+}
+</style>
+
+<div id="outer">
+ <div id="inner">PASS</div>
+</div>
+<script>
+description("Tests if the Deprecated Flex boxes with max-width: intrinsic and width:0 has non-zero calculated width");
+var x = document.getElementById('inner');
+var flexBoxDiv = x.getClientRects()[0];
+shouldBeNonZero("flexBoxDiv.width");
+
+//cleanup
+var node = document.getElementById('inner');
+node.parentNode.removeChild(node);
+</script>
+<script src=""
Modified: trunk/Source/WebCore/ChangeLog (117412 => 117413)
--- trunk/Source/WebCore/ChangeLog 2012-05-17 08:14:33 UTC (rev 117412)
+++ trunk/Source/WebCore/ChangeLog 2012-05-17 08:18:59 UTC (rev 117413)
@@ -1,3 +1,18 @@
+2012-05-17 Pravin D <pravind....@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 <udayki...@motorola.com>
CSS3 Multicolumn: Content in normal flow extending into column gaps should be clipped at middle of column-gap
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (117412 => 117413)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2012-05-17 08:14:33 UTC (rev 117412)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2012-05-17 08:18:59 UTC (rev 117413)
@@ -5174,7 +5174,8 @@
updateFirstLetter();
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 {
m_minPreferredLogicalWidth = 0;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
