Title: [123783] trunk
- Revision
- 123783
- Author
- t...@chromium.org
- Date
- 2012-07-26 12:56:26 -0700 (Thu, 26 Jul 2012)
Log Message
Regression: r123696 made css3/flexbox tests failing
https://bugs.webkit.org/show_bug.cgi?id=92352
Reviewed by Levi Weintraub.
Source/WebCore:
Use roundedLayoutUnit so ports without subpixel layout still pass existing tests.
Covered by css3/flexbox/flex-algorithm-min-max.html which should pass again.
* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::resolveFlexibleLengths):
LayoutTests:
Skip css3/flexbox/flex-rounding.html on ports that don't enable subpixel layout.
* platform/efl/TestExpectations:
* platform/gtk/TestExpectations:
* platform/mac/Skipped:
* platform/qt/Skipped:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (123782 => 123783)
--- trunk/LayoutTests/ChangeLog 2012-07-26 19:54:29 UTC (rev 123782)
+++ trunk/LayoutTests/ChangeLog 2012-07-26 19:56:26 UTC (rev 123783)
@@ -1,3 +1,17 @@
+2012-07-26 Tony Chang <t...@chromium.org>
+
+ Regression: r123696 made css3/flexbox tests failing
+ https://bugs.webkit.org/show_bug.cgi?id=92352
+
+ Reviewed by Levi Weintraub.
+
+ Skip css3/flexbox/flex-rounding.html on ports that don't enable subpixel layout.
+
+ * platform/efl/TestExpectations:
+ * platform/gtk/TestExpectations:
+ * platform/mac/Skipped:
+ * platform/qt/Skipped:
+
2012-07-26 Emil A Eklund <e...@chromium.org>
Contained div with right 0 sometimes overlaps parent div
Modified: trunk/LayoutTests/platform/efl/TestExpectations (123782 => 123783)
--- trunk/LayoutTests/platform/efl/TestExpectations 2012-07-26 19:54:29 UTC (rev 123782)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2012-07-26 19:56:26 UTC (rev 123783)
@@ -820,6 +820,5 @@
// Failing after r123379 on EFL and GTK.
BUGWK92063 : fast/css/sticky/parsing-position-sticky.html = TEXT
-// Regression: r123696 made css3/flexbox tests failing on EFL and QT
-BUGWK92352 : css3/flexbox/flex-algorithm-min-max.html = TEXT
+// This test depends on subpixel layout.
BUGWK92352 : css3/flexbox/flex-rounding.html = TEXT
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (123782 => 123783)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2012-07-26 19:54:29 UTC (rev 123782)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2012-07-26 19:56:26 UTC (rev 123783)
@@ -1258,7 +1258,7 @@
BUGWK92100 : accessibility/canvas-accessibilitynodeobject.html = TEXT
-BUGWK92352 : css3/flexbox/flex-algorithm-min-max.html = TEXT
+// This test depends on subpixel layout.
BUGWK92352 : css3/flexbox/flex-rounding.html = TEXT
//////////////////////////////////////////////////////////////////////////////////////////
Modified: trunk/LayoutTests/platform/mac/Skipped (123782 => 123783)
--- trunk/LayoutTests/platform/mac/Skipped 2012-07-26 19:54:29 UTC (rev 123782)
+++ trunk/LayoutTests/platform/mac/Skipped 2012-07-26 19:56:26 UTC (rev 123783)
@@ -952,3 +952,7 @@
# https://bugs.webkit.org/show_bug.cgi?id=91505
platform/mac/plugins/root-object-premature-delete-crash.html
+
+# This test depends on subpixel layout.
+# https://bugs.webkit.org/show_bug.cgi?id=92352
+css3/flexbox/flex-rounding.html
Modified: trunk/LayoutTests/platform/qt/Skipped (123782 => 123783)
--- trunk/LayoutTests/platform/qt/Skipped 2012-07-26 19:54:29 UTC (rev 123782)
+++ trunk/LayoutTests/platform/qt/Skipped 2012-07-26 19:56:26 UTC (rev 123783)
@@ -2669,8 +2669,6 @@
# https://bugs.webkit.org/show_bug.cgi?id=92039
svg/repaint/container-repaint.svg
-# Regression: r123696 made css3/flexbox tests failing
+# This test depends on subpixel layout.
# https://bugs.webkit.org/show_bug.cgi?id=92352
-css3/flexbox/cross-axis-scrollbar.html
-css3/flexbox/flex-algorithm-min-max.html
css3/flexbox/flex-rounding.html
Modified: trunk/Source/WebCore/ChangeLog (123782 => 123783)
--- trunk/Source/WebCore/ChangeLog 2012-07-26 19:54:29 UTC (rev 123782)
+++ trunk/Source/WebCore/ChangeLog 2012-07-26 19:56:26 UTC (rev 123783)
@@ -1,3 +1,17 @@
+2012-07-26 Tony Chang <t...@chromium.org>
+
+ Regression: r123696 made css3/flexbox tests failing
+ https://bugs.webkit.org/show_bug.cgi?id=92352
+
+ Reviewed by Levi Weintraub.
+
+ Use roundedLayoutUnit so ports without subpixel layout still pass existing tests.
+
+ Covered by css3/flexbox/flex-algorithm-min-max.html which should pass again.
+
+ * rendering/RenderFlexibleBox.cpp:
+ (WebCore::RenderFlexibleBox::resolveFlexibleLengths):
+
2012-07-26 Emil A Eklund <e...@chromium.org>
Contained div with right 0 sometimes overlaps parent div
Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (123782 => 123783)
--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2012-07-26 19:54:29 UTC (rev 123782)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2012-07-26 19:56:26 UTC (rev 123783)
@@ -878,9 +878,9 @@
LayoutUnit preferredChildSize = preferredMainAxisContentExtentForChild(child);
LayoutUnit childSize = preferredChildSize;
if (availableFreeSpace > 0 && totalFlexGrow > 0 && flexSign == PositiveFlexibility && isfinite(totalFlexGrow))
- childSize += availableFreeSpace * child->style()->flexGrow() / totalFlexGrow;
+ childSize += roundedLayoutUnit(availableFreeSpace * child->style()->flexGrow() / totalFlexGrow);
else if (availableFreeSpace < 0 && totalWeightedFlexShrink > 0 && flexSign == NegativeFlexibility && isfinite(totalWeightedFlexShrink))
- childSize += availableFreeSpace * child->style()->flexShrink() * preferredChildSize / totalWeightedFlexShrink;
+ childSize += roundedLayoutUnit(availableFreeSpace * child->style()->flexShrink() * preferredChildSize / totalWeightedFlexShrink);
LayoutUnit adjustedChildSize = adjustChildSizeForMinAndMax(child, childSize, flexboxAvailableContentExtent);
childSizes.append(adjustedChildSize);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
