<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[213733] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/213733">213733</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2017-03-10 16:33:18 -0800 (Fri, 10 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simple line layout: Check how many orphans needed on the current page before breaking.
https://bugs.webkit.org/show_bug.cgi?id=169477
Reviewed by Antti Koivisto.
Source/WebCore:
Before breaking for the widows we actually need to check for orphans first.
Test: fast/multicol/simple-line-layout-orphans-and-widows.html
* rendering/SimpleLineLayoutPagination.cpp:
(WebCore::SimpleLineLayout::computeLineBreakIndex):
(WebCore::SimpleLineLayout::adjustLinePositionsForPagination):
LayoutTests:
* fast/multicol/simple-line-layout-orphans-and-widows-expected.html: Added.
* fast/multicol/simple-line-layout-orphans-and-widows.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutPaginationcpp">trunk/Source/WebCore/rendering/SimpleLineLayoutPagination.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmulticolsimplelinelayoutorphansandwidowsexpectedhtml">trunk/LayoutTests/fast/multicol/simple-line-layout-orphans-and-widows-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastmulticolsimplelinelayoutorphansandwidowshtml">trunk/LayoutTests/fast/multicol/simple-line-layout-orphans-and-widows.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (213732 => 213733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-10 23:47:42 UTC (rev 213732)
+++ trunk/LayoutTests/ChangeLog 2017-03-11 00:33:18 UTC (rev 213733)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-03-10 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Check how many orphans needed on the current page before breaking.
+ https://bugs.webkit.org/show_bug.cgi?id=169477
+
+ Reviewed by Antti Koivisto.
+
+ * fast/multicol/simple-line-layout-orphans-and-widows-expected.html: Added.
+ * fast/multicol/simple-line-layout-orphans-and-widows.html: Added.
+
</ins><span class="cx"> 2017-03-10 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Mark webrtc/libwebrtc/descriptionGetters.html as a flaky.
</span></span></pre></div>
<a id="trunkLayoutTestsfastmulticolsimplelinelayoutorphansandwidowsexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/simple-line-layout-orphans-and-widows-expected.html (0 => 213733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/simple-line-layout-orphans-and-widows-expected.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/simple-line-layout-orphans-and-widows-expected.html 2017-03-11 00:33:18 UTC (rev 213733)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests orphans handling with simple line layout.</title>
+<script>
+ if (window.internals)
+ internals.setPagination("LeftToRightPaginated", 0);
+</script>
+<style>
+body {
+ width: 494px;
+}
+
+div {
+ font-size: 54px;
+ margin: 0px;
+}
+</style>
+</head>
+<body>
+<div>foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar</div>
+<div>foobar foobar foobar foobar foobar foobar foobar</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmulticolsimplelinelayoutorphansandwidowshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/simple-line-layout-orphans-and-widows.html (0 => 213733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/simple-line-layout-orphans-and-widows.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/simple-line-layout-orphans-and-widows.html 2017-03-11 00:33:18 UTC (rev 213733)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests orphans handling with simple line layout.</title>
+<script>
+ if (window.internals)
+ internals.setPagination("LeftToRightPaginated", 0);
+</script>
+<style>
+body {
+ orphans: 2;
+ widows: 3;
+ width: 494px;
+}
+
+div {
+ font-size: 54px;
+ margin: 0px;
+}
+</style>
+</head>
+<body>
+<div>foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar</div>
+<div>foobar foobar foobar foobar foobar foobar foobar</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213732 => 213733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-10 23:47:42 UTC (rev 213732)
+++ trunk/Source/WebCore/ChangeLog 2017-03-11 00:33:18 UTC (rev 213733)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-03-10 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Check how many orphans needed on the current page before breaking.
+ https://bugs.webkit.org/show_bug.cgi?id=169477
+
+ Reviewed by Antti Koivisto.
+
+ Before breaking for the widows we actually need to check for orphans first.
+
+ Test: fast/multicol/simple-line-layout-orphans-and-widows.html
+
+ * rendering/SimpleLineLayoutPagination.cpp:
+ (WebCore::SimpleLineLayout::computeLineBreakIndex):
+ (WebCore::SimpleLineLayout::adjustLinePositionsForPagination):
+
</ins><span class="cx"> 2017-03-10 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> WebGPU: Backend - Textures and TextureDescriptors
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutPaginationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutPagination.cpp (213732 => 213733)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutPagination.cpp 2017-03-10 23:47:42 UTC (rev 213732)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutPagination.cpp 2017-03-11 00:33:18 UTC (rev 213733)
</span><span class="lines">@@ -63,18 +63,20 @@
</span><span class="cx"> return { topPosition, bottomPosition, bottomPosition - topPosition };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static unsigned computeLineBreakIndex(unsigned breakCandidate, unsigned lineCount, unsigned widows, const Layout::SimpleLineStruts& struts)
</del><ins>+static unsigned computeLineBreakIndex(unsigned breakCandidate, unsigned lineCount, int orphansNeeded, int widowsNeeded,
+ const Layout::SimpleLineStruts& struts)
</ins><span class="cx"> {
</span><span class="cx"> // First line does not fit the current page.
</span><span class="cx"> if (!breakCandidate)
</span><span class="cx"> return breakCandidate;
</span><span class="cx">
</span><del>- auto remainingLineCount = lineCount - breakCandidate;
- if (widows <= remainingLineCount)
</del><ins>+ int widowsOnTheNextPage = lineCount - breakCandidate;
+ if (widowsNeeded <= widowsOnTheNextPage)
</ins><span class="cx"> return breakCandidate;
</span><del>-
</del><span class="cx"> // Only break after the first line with widows.
</span><del>- auto lineBreak = std::max<int>(lineCount - widows, 1);
</del><ins>+ auto lineBreak = std::max<int>(lineCount - widowsNeeded, 1);
+ if (orphansNeeded > lineBreak)
+ return breakCandidate;
</ins><span class="cx"> // Break on current page only.
</span><span class="cx"> if (struts.isEmpty())
</span><span class="cx"> return lineBreak;
</span><span class="lines">@@ -97,9 +99,9 @@
</span><span class="cx"> auto line = lines.at(lineBreakIndex);
</span><span class="cx"> auto remainingLogicalHeight = flow.pageRemainingLogicalHeightForOffset(line.top, RenderBlockFlow::ExcludePageBoundary);
</span><span class="cx"> auto& style = flow.style();
</span><del>- auto firstLineWithDoesNotFit = !lineBreakIndex && line.height < flow.pageLogicalHeightForOffset(line.top);
</del><ins>+ auto firstLineDoesNotFit = !lineBreakIndex && line.height < flow.pageLogicalHeightForOffset(line.top);
</ins><span class="cx"> auto orphanDoesNotFit = !style.hasAutoOrphans() && style.orphans() > (short)lineBreakIndex;
</span><del>- if (firstLineWithDoesNotFit || orphanDoesNotFit) {
</del><ins>+ if (firstLineDoesNotFit || orphanDoesNotFit) {
</ins><span class="cx"> auto firstLine = lines.first();
</span><span class="cx"> auto firstLineOverflowRect = computeOverflow(flow, LayoutRect(0, firstLine.top, 0, firstLine.height));
</span><span class="cx"> auto firstLineUpperOverhang = std::max<LayoutUnit>(-firstLineOverflowRect.y(), 0);
</span><span class="lines">@@ -132,6 +134,7 @@
</span><span class="cx"> return;
</span><span class="cx"> unsigned lineIndex = 0;
</span><span class="cx"> auto widows = flow.style().hasAutoWidows() ? 1 : std::max<int>(flow.style().widows(), 1);
</span><ins>+ auto orphans = flow.style().hasAutoOrphans() ? 1 : std::max<int>(flow.style().orphans(), 1);
</ins><span class="cx"> PaginatedLines lines;
</span><span class="cx"> for (unsigned runIndex = 0; runIndex < simpleLines.runCount(); ++runIndex) {
</span><span class="cx"> auto& run = simpleLines.runAt(runIndex);
</span><span class="lines">@@ -143,11 +146,11 @@
</span><span class="cx"> auto remainingHeight = flow.pageRemainingLogicalHeightForOffset(line.top, RenderBlockFlow::ExcludePageBoundary);
</span><span class="cx"> auto atTheTopOfColumnOrPage = flow.pageLogicalHeightForOffset(line.top) == remainingHeight;
</span><span class="cx"> if (line.height > remainingHeight || (atTheTopOfColumnOrPage && lineIndex)) {
</span><del>- auto lineBreakIndex = computeLineBreakIndex(lineIndex, lineCount, widows, struts);
</del><ins>+ auto lineBreakIndex = computeLineBreakIndex(lineIndex, lineCount, orphans, widows, struts);
</ins><span class="cx"> // Are we still at the top of the column/page?
</span><span class="cx"> atTheTopOfColumnOrPage = atTheTopOfColumnOrPage ? lineIndex == lineBreakIndex : false;
</span><span class="cx"> setPageBreakForLine(lineBreakIndex, lines, flow, struts, atTheTopOfColumnOrPage);
</span><del>- // Recompute line positions that we already visited but window break pushed them to a new page.
</del><ins>+ // Recompute line positions that we already visited but widow break pushed them to a new page.
</ins><span class="cx"> for (auto i = lineBreakIndex; i < lines.size(); ++i)
</span><span class="cx"> lines.at(i) = computeLineTopAndBottomWithOverflow(flow, i, struts);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>