From: ryanhaddad@apple.com Date: Thu, 6 Apr 2017 23:24:44 +0000 (+0000) Subject: Unreviewed, rolling out r215041. X-Git-Url: http://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=acf8d5cb0bc6e5eed42a68cf3e343dc03ebade08 Unreviewed, rolling out r215041. The LayoutTest for this change is failing on ios-simulator. Reverted changeset: "Rendering flexbox children across columns" https://bugs.webkit.org/show_bug.cgi?id=164166 http://trac.webkit.org/changeset/215041 git-svn-id: https://svn.webkit.org/repository/webkit/trunk@215067 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index bc539a6..c1936ca9 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,5 +1,17 @@ 2017-04-06 Ryan Haddad + Unreviewed, rolling out r215041. + + The LayoutTest for this change is failing on ios-simulator. + + Reverted changeset: + + "Rendering flexbox children across columns" + https://bugs.webkit.org/show_bug.cgi?id=164166 + http://trac.webkit.org/changeset/215041 + +2017-04-06 Ryan Haddad + Unreviewed, rolling out r215046. This change broke internal builds. diff --git a/LayoutTests/fast/multicol/flexbox-rows-expected.html b/LayoutTests/fast/multicol/flexbox-rows-expected.html deleted file mode 100644 index 043e9f8..0000000 --- a/LayoutTests/fast/multicol/flexbox-rows-expected.html +++ /dev/null @@ -1,56 +0,0 @@ - - -
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - diff --git a/LayoutTests/fast/multicol/flexbox-rows.html b/LayoutTests/fast/multicol/flexbox-rows.html deleted file mode 100644 index 6c313a0..0000000 --- a/LayoutTests/fast/multicol/flexbox-rows.html +++ /dev/null @@ -1,62 +0,0 @@ - - -
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index e1e8dc6..4114a2f 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,5 +1,17 @@ 2017-04-06 Ryan Haddad + Unreviewed, rolling out r215041. + + The LayoutTest for this change is failing on ios-simulator. + + Reverted changeset: + + "Rendering flexbox children across columns" + https://bugs.webkit.org/show_bug.cgi?id=164166 + http://trac.webkit.org/changeset/215041 + +2017-04-06 Ryan Haddad + Unreviewed, rolling out r215046. This change broke internal builds. diff --git a/Source/WebCore/rendering/RenderBlockFlow.cpp b/Source/WebCore/rendering/RenderBlockFlow.cpp index e3a9951..ce2cf19 100644 --- a/Source/WebCore/rendering/RenderBlockFlow.cpp +++ b/Source/WebCore/rendering/RenderBlockFlow.cpp @@ -36,7 +36,6 @@ #include "LayoutRepainter.h" #include "Logging.h" #include "RenderCombineText.h" -#include "RenderFlexibleBox.h" #include "RenderInline.h" #include "RenderIterator.h" #include "RenderLayer.h" @@ -1866,19 +1865,14 @@ bool RenderBlockFlow::hasNextPage(LayoutUnit logicalOffset, PageBoundaryRule pag LayoutUnit RenderBlockFlow::adjustForUnsplittableChild(RenderBox& child, LayoutUnit logicalOffset, LayoutUnit childBeforeMargin, LayoutUnit childAfterMargin) { - // When flexboxes are embedded inside a block flow, they don't perform any adjustments for unsplittable - // children. We'll treat flexboxes themselves as unsplittable just to get them to paginate properly inside - // a block flow. - bool isUnsplittable = childBoxIsUnsplittableForFragmentation(child); - if (!isUnsplittable && !(child.isFlexibleBox() && !downcast(child).isFlexibleBoxImpl())) + if (!childBoxIsUnsplittableForFragmentation(child)) return logicalOffset; RenderFlowThread* flowThread = flowThreadContainingBlock(); LayoutUnit childLogicalHeight = logicalHeightForChild(child) + childBeforeMargin + childAfterMargin; LayoutUnit pageLogicalHeight = pageLogicalHeightForOffset(logicalOffset); bool hasUniformPageLogicalHeight = !flowThread || flowThread->regionsHaveUniformLogicalHeight(); - if (isUnsplittable) - updateMinimumPageHeight(logicalOffset, childLogicalHeight); + updateMinimumPageHeight(logicalOffset, childLogicalHeight); if (!pageLogicalHeight || (hasUniformPageLogicalHeight && childLogicalHeight > pageLogicalHeight) || !hasNextPage(logicalOffset)) return logicalOffset;