<!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>[213057] releases/WebKitGTK/webkit-2.16/Source/WebCore</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/213057">213057</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-27 06:29:02 -0800 (Mon, 27 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/212843">r212843</a> - Simple line layout: ensureLineBoxes for paginated content.
https://bugs.webkit.org/show_bug.cgi?id=168729
<rdar://problem/30654400>
Reviewed by Antti Koivisto.
This patch sets the layout state bits for paginated subtree layout, when we are switching
over from simple line runs to inline tree.
Not enabled yet.
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::ensureLineBoxes):
* rendering/RenderView.cpp:
(WebCore::RenderView::pushLayoutStateForPagination): LayoutUnit(1) is not the real height, it's just
an indicator that we've got paginated content.
* rendering/RenderView.h:
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::create):
(WebCore::SimpleLineLayout::Layout::create):
(WebCore::SimpleLineLayout::Layout::Layout):
* rendering/SimpleLineLayout.h:
(WebCore::SimpleLineLayout::Layout::isPaginated):
(WebCore::SimpleLineLayout::Layout::hasPaginationStruts):
* rendering/SimpleLineLayoutFunctions.h:
(WebCore::SimpleLineLayout::computeFlowHeight):
* rendering/SimpleLineLayoutResolver.h:
(WebCore::SimpleLineLayout::RunResolver::Run::computeBaselinePosition):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCorerenderingRenderBlockFlowcpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCorerenderingRenderViewcpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderView.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCorerenderingRenderViewh">releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderView.h</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCorerenderingSimpleLineLayoutcpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/SimpleLineLayout.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCorerenderingSimpleLineLayouth">releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/SimpleLineLayout.h</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCorerenderingSimpleLineLayoutFunctionsh">releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/SimpleLineLayoutFunctions.h</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCorerenderingSimpleLineLayoutResolverh">releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/SimpleLineLayoutResolver.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit216SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (213056 => 213057)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-02-27 14:24:58 UTC (rev 213056)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-02-27 14:29:02 UTC (rev 213057)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2017-02-22 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: ensureLineBoxes for paginated content.
+ https://bugs.webkit.org/show_bug.cgi?id=168729
+ <rdar://problem/30654400>
+
+ Reviewed by Antti Koivisto.
+
+ This patch sets the layout state bits for paginated subtree layout, when we are switching
+ over from simple line runs to inline tree.
+
+ Not enabled yet.
+
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::ensureLineBoxes):
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::pushLayoutStateForPagination): LayoutUnit(1) is not the real height, it's just
+ an indicator that we've got paginated content.
+ * rendering/RenderView.h:
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::create):
+ (WebCore::SimpleLineLayout::Layout::create):
+ (WebCore::SimpleLineLayout::Layout::Layout):
+ * rendering/SimpleLineLayout.h:
+ (WebCore::SimpleLineLayout::Layout::isPaginated):
+ (WebCore::SimpleLineLayout::Layout::hasPaginationStruts):
+ * rendering/SimpleLineLayoutFunctions.h:
+ (WebCore::SimpleLineLayout::computeFlowHeight):
+ * rendering/SimpleLineLayoutResolver.h:
+ (WebCore::SimpleLineLayout::RunResolver::Run::computeBaselinePosition):
+
</ins><span class="cx"> 2017-02-22 Xabier Rodriguez Calvar <calvaris@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer][EME] Fix issue with allowed systems extraction
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderBlockFlow.cpp (213056 => 213057)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderBlockFlow.cpp 2017-02-27 14:24:58 UTC (rev 213056)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderBlockFlow.cpp 2017-02-27 14:29:02 UTC (rev 213057)
</span><span class="lines">@@ -3700,6 +3700,7 @@
</span><span class="cx"> setLineLayoutPath(ForceLineBoxesPath);
</span><span class="cx"> if (!m_simpleLineLayout)
</span><span class="cx"> return;
</span><ins>+ bool isPaginated = m_simpleLineLayout->isPaginated();
</ins><span class="cx"> m_simpleLineLayout = nullptr;
</span><span class="cx">
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="lines">@@ -3710,7 +3711,12 @@
</span><span class="cx"> bool relayoutChildren = false;
</span><span class="cx"> LayoutUnit repaintLogicalTop;
</span><span class="cx"> LayoutUnit repaintLogicalBottom;
</span><del>- layoutLineBoxes(relayoutChildren, repaintLogicalTop, repaintLogicalBottom);
</del><ins>+ if (isPaginated) {
+ view().pushLayoutStateForPagination(*this);
+ layoutLineBoxes(relayoutChildren, repaintLogicalTop, repaintLogicalBottom);
+ view().popLayoutState(*this);
+ } else
+ layoutLineBoxes(relayoutChildren, repaintLogicalTop, repaintLogicalBottom);
</ins><span class="cx">
</span><span class="cx"> updateLogicalHeight();
</span><span class="cx"> ASSERT(didNeedLayout || logicalHeight() == oldHeight);
</span><span class="lines">@@ -3944,7 +3950,7 @@
</span><span class="cx"> // enabled and flow thread height is still unknown (i.e. during the first layout pass). When
</span><span class="cx"> // it's unknown, we need to prevent the pagination code from assuming page breaks everywhere
</span><span class="cx"> // and thereby eating every top margin. It should be trivial to clean up and get rid of this
</span><del>- // hack once the old multicol implementation is gone.
</del><ins>+ // hack once the old multicol implementation is gone (see also RenderView::pushLayoutStateForPagination).
</ins><span class="cx"> pageLogicalHeight = flowThread.isPageLogicalHeightKnown() ? LayoutUnit(1) : LayoutUnit(0);
</span><span class="cx">
</span><span class="cx"> pageLogicalHeightChanged = flowThread.pageLogicalSizeChanged();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderView.cpp (213056 => 213057)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderView.cpp 2017-02-27 14:24:58 UTC (rev 213056)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderView.cpp 2017-02-27 14:29:02 UTC (rev 213057)
</span><span class="lines">@@ -1232,6 +1232,15 @@
</span><span class="cx"> pushLayoutStateForCurrentFlowThread(root);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderView::pushLayoutStateForPagination(RenderBlockFlow& layoutRoot)
+{
+ pushLayoutState(layoutRoot);
+ ASSERT(m_layoutState);
+ m_layoutState->m_isPaginated = true;
+ // This is just a flag for known page height (see RenderBlockFlow::checkForPaginationLogicalHeightChange).
+ m_layoutState->m_pageLogicalHeight = 1;
+}
+
</ins><span class="cx"> IntSize RenderView::viewportSizeForCSSViewportUnits() const
</span><span class="cx"> {
</span><span class="cx"> return frameView().viewportSizeForCSSViewportUnits();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderView.h (213056 => 213057)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderView.h 2017-02-27 14:24:58 UTC (rev 213056)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderView.h 2017-02-27 14:29:02 UTC (rev 213057)
</span><span class="lines">@@ -132,6 +132,7 @@
</span><span class="cx">
</span><span class="cx"> // Subtree push/pop
</span><span class="cx"> void pushLayoutState(RenderObject&);
</span><ins>+ void pushLayoutStateForPagination(RenderBlockFlow&);
</ins><span class="cx"> void popLayoutState(RenderObject&) { return popLayoutState(); } // Just doing this to keep popLayoutState() private and to make the subtree calls symmetrical.
</span><span class="cx">
</span><span class="cx"> // Returns true if layoutState should be used for its cached offset and clip.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/SimpleLineLayout.cpp (213056 => 213057)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/SimpleLineLayout.cpp 2017-02-27 14:24:58 UTC (rev 213056)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/SimpleLineLayout.cpp 2017-02-27 14:29:02 UTC (rev 213057)
</span><span class="lines">@@ -1045,20 +1045,22 @@
</span><span class="cx"> Layout::RunVector runs;
</span><span class="cx"> createTextRuns(runs, flow, lineCount);
</span><span class="cx"> Layout::SimplePaginationStruts struts;
</span><del>- if (flow.view().layoutState() && flow.view().layoutState()->isPaginated())
</del><ins>+ auto isPaginated = flow.view().layoutState() && flow.view().layoutState()->isPaginated();
+ if (isPaginated)
</ins><span class="cx"> adjustLinePositionsForPagination(runs, struts, flow, lineCount);
</span><del>- return Layout::create(runs, struts, lineCount);
</del><ins>+ return Layout::create(runs, struts, lineCount, isPaginated);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<Layout> Layout::create(const RunVector& runVector, SimplePaginationStruts& struts, unsigned lineCount)
</del><ins>+std::unique_ptr<Layout> Layout::create(const RunVector& runVector, SimplePaginationStruts& struts, unsigned lineCount, bool isPaginated)
</ins><span class="cx"> {
</span><span class="cx"> void* slot = WTF::fastMalloc(sizeof(Layout) + sizeof(Run) * runVector.size());
</span><del>- return std::unique_ptr<Layout>(new (NotNull, slot) Layout(runVector, struts, lineCount));
</del><ins>+ return std::unique_ptr<Layout>(new (NotNull, slot) Layout(runVector, struts, lineCount, isPaginated));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Layout::Layout(const RunVector& runVector, SimplePaginationStruts& struts, unsigned lineCount)
</del><ins>+Layout::Layout(const RunVector& runVector, SimplePaginationStruts& struts, unsigned lineCount, bool isPaginated)
</ins><span class="cx"> : m_lineCount(lineCount)
</span><span class="cx"> , m_runCount(runVector.size())
</span><ins>+ , m_isPaginated(isPaginated)
</ins><span class="cx"> , m_paginationStruts(WTFMove(struts))
</span><span class="cx"> {
</span><span class="cx"> memcpy(m_runs, runVector.data(), m_runCount * sizeof(Run));
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCorerenderingSimpleLineLayouth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/SimpleLineLayout.h (213056 => 213057)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/SimpleLineLayout.h 2017-02-27 14:24:58 UTC (rev 213056)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/SimpleLineLayout.h 2017-02-27 14:29:02 UTC (rev 213057)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> public:
</span><span class="cx"> using RunVector = Vector<Run, 10>;
</span><span class="cx"> using SimplePaginationStruts = Vector<SimplePaginationStrut, 4>;
</span><del>- static std::unique_ptr<Layout> create(const RunVector&, SimplePaginationStruts&, unsigned lineCount);
</del><ins>+ static std::unique_ptr<Layout> create(const RunVector&, SimplePaginationStruts&, unsigned lineCount, bool isPaginated);
</ins><span class="cx">
</span><span class="cx"> unsigned lineCount() const { return m_lineCount; }
</span><span class="cx">
</span><span class="lines">@@ -83,13 +83,15 @@
</span><span class="cx"> unsigned runCount() const { return m_runCount; }
</span><span class="cx"> const Run& runAt(unsigned i) const { return m_runs[i]; }
</span><span class="cx">
</span><del>- bool isPaginated() const { return !m_paginationStruts.isEmpty(); }
</del><ins>+ bool isPaginated() const { return m_isPaginated; }
+ bool hasPaginationStruts() const { return !m_paginationStruts.isEmpty(); }
</ins><span class="cx"> const SimplePaginationStruts& struts() const { return m_paginationStruts; }
</span><span class="cx"> private:
</span><del>- Layout(const RunVector&, SimplePaginationStruts&, unsigned lineCount);
</del><ins>+ Layout(const RunVector&, SimplePaginationStruts&, unsigned lineCount, bool isPaginated);
</ins><span class="cx">
</span><span class="cx"> unsigned m_lineCount;
</span><span class="cx"> unsigned m_runCount;
</span><ins>+ bool m_isPaginated;
</ins><span class="cx"> SimplePaginationStruts m_paginationStruts;
</span><span class="cx"> Run m_runs[0];
</span><span class="cx"> };
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCorerenderingSimpleLineLayoutFunctionsh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/SimpleLineLayoutFunctions.h (213056 => 213057)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/SimpleLineLayoutFunctions.h 2017-02-27 14:24:58 UTC (rev 213056)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/SimpleLineLayoutFunctions.h 2017-02-27 14:29:02 UTC (rev 213057)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> inline LayoutUnit computeFlowHeight(const RenderBlockFlow& flow, const Layout& layout)
</span><span class="cx"> {
</span><span class="cx"> auto flowHeight = lineHeightFromFlow(flow) * layout.lineCount();
</span><del>- if (!layout.isPaginated())
</del><ins>+ if (!layout.hasPaginationStruts())
</ins><span class="cx"> return flowHeight;
</span><span class="cx"> for (auto& strutEntry : layout.struts())
</span><span class="cx"> flowHeight += strutEntry.offset;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCorerenderingSimpleLineLayoutResolverh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/SimpleLineLayoutResolver.h (213056 => 213057)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/SimpleLineLayoutResolver.h 2017-02-27 14:24:58 UTC (rev 213056)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/SimpleLineLayoutResolver.h 2017-02-27 14:29:02 UTC (rev 213057)
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx"> {
</span><span class="cx"> auto& resolver = m_iterator.resolver();
</span><span class="cx"> auto offset = resolver.m_borderAndPaddingBefore + resolver.m_lineHeight * lineIndex();
</span><del>- if (!resolver.m_layout.isPaginated())
</del><ins>+ if (!resolver.m_layout.hasPaginationStruts())
</ins><span class="cx"> return offset + resolver.m_baseline;
</span><span class="cx"> for (auto& strutEntry : resolver.m_layout.struts()) {
</span><span class="cx"> if (strutEntry.lineBreak > lineIndex())
</span></span></pre>
</div>
</div>
</body>
</html>