2017-04-06 Ryan Haddad <ryanhaddad@apple.com>
+ 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 <ryanhaddad@apple.com>
+
Unreviewed, rolling out r215046.
This change broke internal builds.
+++ /dev/null
-<!DOCTYPE html><html class=''>
- <head><style>
- .wrapper {
- -webkit-column-count: 2;
- -moz-column-count: 2;
- column-count: 2;
- }
-
- .pad-rows .row {
- padding-top: 12px;
- }
-
- /**
- * Other styles
- */
- .description {
- margin: 0 1em;
- font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
- font-size: 14px;
- line-height: 1.5;
- }
- .description > ul > li + li {
- margin-top: 1em;
- }
- .description em {
- font-size: 0.875em;
- color: darkgray;
- }
-
- input {
- margin-left: 1em;
- }
-
- hr {
- margin: 1em 0;
- }
- </style></head><body>
- <div class="description">
-
- <div class="wrapper">
- <div class="row"><label>Label</label><input type="text"></div>
- <div class="row"><label>Label</label><input type="text"></div>
- <div class="row"><label>Label</label><input type="text"></div>
- <div class="row"><label>Label</label><input type="text"></div>
- <div class="row"><label>Label</label><input type="text"></div>
- </div>
- <hr>
- <div class="wrapper pad-rows">
- <div class="row"><label>Label</label><input type="text"></div>
- <div class="row"><label>Label</label><input type="text"></div>
- <div class="row"><label>Label</label><input type="text"></div>
- <div class="row"><label>Label</label><input type="text"></div>
- <div class="row"><label>Label</label><input type="text"></div>
- </div>
-
- </body></html>
+++ /dev/null
-<!DOCTYPE html><html class=''>
- <head><style>
- .wrapper {
- -webkit-column-count: 2;
- -moz-column-count: 2;
- column-count: 2;
- }
-
- .row {
- display: -webkit-box;
- display: -ms-flexbox;
- display: flex;
- }
-
- .pad-rows .row {
- padding-top: 12px;
- }
-
- /**
- * Other styles
- */
- .description {
- margin: 0 1em;
- font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
- font-size: 14px;
- line-height: 1.5;
- }
- .description > ul > li + li {
- margin-top: 1em;
- }
- .description em {
- font-size: 0.875em;
- color: darkgray;
- }
-
- input {
- margin-left: 1em;
- }
-
- hr {
- margin: 1em 0;
- }
- </style></head><body>
- <div class="description">
-
- <div class="wrapper">
- <div class="row"><label>Label</label><input type="text"></div>
- <div class="row"><label>Label</label><input type="text"></div>
- <div class="row"><label>Label</label><input type="text"></div>
- <div class="row"><label>Label</label><input type="text"></div>
- <div class="row"><label>Label</label><input type="text"></div>
- </div>
- <hr>
- <div class="wrapper pad-rows">
- <div class="row"><label>Label</label><input type="text"></div>
- <div class="row"><label>Label</label><input type="text"></div>
- <div class="row"><label>Label</label><input type="text"></div>
- <div class="row"><label>Label</label><input type="text"></div>
- <div class="row"><label>Label</label><input type="text"></div>
- </div>
-
- </body></html>
2017-04-06 Ryan Haddad <ryanhaddad@apple.com>
+ 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 <ryanhaddad@apple.com>
+
Unreviewed, rolling out r215046.
This change broke internal builds.
#include "LayoutRepainter.h"
#include "Logging.h"
#include "RenderCombineText.h"
-#include "RenderFlexibleBox.h"
#include "RenderInline.h"
#include "RenderIterator.h"
#include "RenderLayer.h"
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<RenderFlexibleBox>(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;