Title: [204785] releases/WebKitGTK/webkit-2.12
- Revision
- 204785
- Author
- [email protected]
- Date
- 2016-08-23 02:18:49 -0700 (Tue, 23 Aug 2016)
Log Message
Merge r201218 - Scrolling broken in iTunes connect pages
https://bugs.webkit.org/show_bug.cgi?id=157678
Reviewed by Zalan Bujtas.
Source/WebCore:
Added fast/flexbox/nested-columns-min-intrinsic-disabled.html
Turn off minimum intrinsic size adjustment for flexboxes. This violates the spec,
but until we can produce good results that is what we need to do. Blink has also
turned off nested columns intrinsic sizing as well, so we match them with this
change.
* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax):
LayoutTests:
* fast/flexbox/nested-column-intrinsic-min-disabled-expected.html: Added.
* fast/flexbox/nested-column-intrinsic-min-disabled.html: Added.
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (204784 => 204785)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-08-23 08:43:00 UTC (rev 204784)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-08-23 09:18:49 UTC (rev 204785)
@@ -1,3 +1,13 @@
+2016-05-20 Dave Hyatt <[email protected]>
+
+ Scrolling broken in iTunes connect pages
+ https://bugs.webkit.org/show_bug.cgi?id=157678
+
+ Reviewed by Zalan Bujtas.
+
+ * fast/flexbox/nested-column-intrinsic-min-disabled-expected.html: Added.
+ * fast/flexbox/nested-column-intrinsic-min-disabled.html: Added.
+
2016-07-19 Zalan Bujtas <[email protected]>
theguardian.co.uk crossword puzzles are sometimes not displaying text
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/flexbox/nested-column-intrinsic-min-disabled-expected.html (0 => 204785)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/flexbox/nested-column-intrinsic-min-disabled-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/flexbox/nested-column-intrinsic-min-disabled-expected.html 2016-08-23 09:18:49 UTC (rev 204785)
@@ -0,0 +1,4 @@
+<html>
+<body>
+<div>This height should be 0. We are violating the spec (section 4.5) for now until we can implement nested column intrinsic sizing properly.</div>
+</body>
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/flexbox/nested-column-intrinsic-min-disabled.html (0 => 204785)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/flexbox/nested-column-intrinsic-min-disabled.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/flexbox/nested-column-intrinsic-min-disabled.html 2016-08-23 09:18:49 UTC (rev 204785)
@@ -0,0 +1,17 @@
+<html>
+<head>
+<style>
+
+.flexbox {
+ display: -webkit-flex;
+}
+
+.column {
+ -webkit-flex-direction: column;
+}
+</style>
+</head>
+<body>
+<div class="flexbox column" style="height:0px">
+<div style="display:flex;background-color:red">This height should be 0. We are violating the spec (section 4.5) for now until we can implement nested column intrinsic sizing properly.</div>
+</div>
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (204784 => 204785)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-08-23 08:43:00 UTC (rev 204784)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-08-23 09:18:49 UTC (rev 204785)
@@ -1,3 +1,20 @@
+2016-05-20 Dave Hyatt <[email protected]>
+
+ Scrolling broken in iTunes connect pages
+ https://bugs.webkit.org/show_bug.cgi?id=157678
+
+ Reviewed by Zalan Bujtas.
+
+ Added fast/flexbox/nested-columns-min-intrinsic-disabled.html
+
+ Turn off minimum intrinsic size adjustment for flexboxes. This violates the spec,
+ but until we can produce good results that is what we need to do. Blink has also
+ turned off nested columns intrinsic sizing as well, so we match them with this
+ change.
+
+ * rendering/RenderFlexibleBox.cpp:
+ (WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax):
+
2016-04-27 Simon Fraser <[email protected]>
SVG SMIL animations run at less than 60fps
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderFlexibleBox.cpp (204784 => 204785)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderFlexibleBox.cpp 2016-08-23 08:43:00 UTC (rev 204784)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderFlexibleBox.cpp 2016-08-23 09:18:49 UTC (rev 204785)
@@ -868,10 +868,12 @@
if (min.isSpecifiedOrIntrinsic())
return std::max(childSize, computeMainAxisExtentForChild(child, MinSize, min).valueOr(childSize));
- if (!isFlexibleBoxImpl() && min.isAuto() && mainAxisOverflowForChild(child) == OVISIBLE) {
+ if (!isFlexibleBoxImpl() && min.isAuto() && mainAxisOverflowForChild(child) == OVISIBLE && !(isColumnFlow() && is<RenderFlexibleBox>(child))) {
// This is the implementation of CSS flexbox section 4.5 which defines the minimum size of "pure" flex
// items. For any other item the value should be 0, this also includes RenderFlexibleBox's derived clases
// (RenderButton, RenderFullScreen...) because that's just an implementation detail.
+ // FIXME: For now we don't handle nested column flexboxes. Need to implement better intrinsic
+ // size handling from the flex box spec first (4.5).
LayoutUnit contentSize = computeMainAxisExtentForChild(child, MinSize, Length(MinContent)).value();
ASSERT(contentSize >= 0);
contentSize = std::min(contentSize, maxExtent.valueOr(contentSize));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
