<!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>[224350] trunk/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/224350">224350</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2017-11-02 12:24:42 -0700 (Thu, 02 Nov 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>LayoutState::m_next is really the ancestor state.
https://bugs.webkit.org/show_bug.cgi?id=179187
<rdar://problem/35319525>

Reviewed by Simon Fraser.

No change in functionality.

* rendering/LayoutState.cpp:
(WebCore::LayoutState::LayoutState):
(WebCore::LayoutState::clearPaginationInformation):
(WebCore::LayoutState::propagateLineGridInfo):
(WebCore::LayoutState::establishLineGrid):
* rendering/LayoutState.h:
* rendering/RenderView.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingLayoutStatecpp">trunk/Source/WebCore/rendering/LayoutState.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingLayoutStateh">trunk/Source/WebCore/rendering/LayoutState.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewh">trunk/Source/WebCore/rendering/RenderView.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (224349 => 224350)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2017-11-02 19:17:25 UTC (rev 224349)
+++ trunk/Source/WebCore/ChangeLog      2017-11-02 19:24:42 UTC (rev 224350)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-11-02  Zalan Bujtas  <zalan@apple.com>
+
+        LayoutState::m_next is really the ancestor state.
+        https://bugs.webkit.org/show_bug.cgi?id=179187
+        <rdar://problem/35319525>
+
+        Reviewed by Simon Fraser.
+
+        No change in functionality.
+
+        * rendering/LayoutState.cpp:
+        (WebCore::LayoutState::LayoutState):
+        (WebCore::LayoutState::clearPaginationInformation):
+        (WebCore::LayoutState::propagateLineGridInfo):
+        (WebCore::LayoutState::establishLineGrid):
+        * rendering/LayoutState.h:
+        * rendering/RenderView.h:
+
</ins><span class="cx"> 2017-11-02  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Fix iOS WebKitLegacy after r224267
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingLayoutStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/LayoutState.cpp (224349 => 224350)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/LayoutState.cpp   2017-11-02 19:17:25 UTC (rev 224349)
+++ trunk/Source/WebCore/rendering/LayoutState.cpp      2017-11-02 19:24:42 UTC (rev 224350)
</span><span class="lines">@@ -34,13 +34,13 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-LayoutState::LayoutState(std::unique_ptr<LayoutState> next, RenderBox* renderer, const LayoutSize& offset, LayoutUnit pageLogicalHeight, bool pageLogicalHeightChanged)
-    : m_next(WTFMove(next))
</del><ins>+LayoutState::LayoutState(std::unique_ptr<LayoutState> ancestor, RenderBox* renderer, const LayoutSize& offset, LayoutUnit pageLogicalHeight, bool pageLogicalHeightChanged)
+    : m_ancestor(WTFMove(ancestor))
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx">     , m_renderer(renderer)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><del>-    ASSERT(m_next);
</del><ins>+    ASSERT(m_ancestor);
</ins><span class="cx"> 
</span><span class="cx">     bool fixed = renderer->isOutOfFlowPositioned() && renderer->style().position() == FixedPosition;
</span><span class="cx">     if (fixed) {
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">         FloatPoint fixedOffset = renderer->view().localToAbsolute(FloatPoint(), IsFixed);
</span><span class="cx">         m_paintOffset = LayoutSize(fixedOffset.x(), fixedOffset.y()) + offset;
</span><span class="cx">     } else
</span><del>-        m_paintOffset = m_next->m_paintOffset + offset;
</del><ins>+        m_paintOffset = m_ancestor->m_paintOffset + offset;
</ins><span class="cx"> 
</span><span class="cx">     if (renderer->isOutOfFlowPositioned() && !fixed) {
</span><span class="cx">         if (RenderElement* container = renderer->container()) {
</span><span class="lines">@@ -62,9 +62,9 @@
</span><span class="cx">     if (renderer->isInFlowPositioned() && renderer->hasLayer())
</span><span class="cx">         m_paintOffset += renderer->layer()->offsetForInFlowPosition();
</span><span class="cx"> 
</span><del>-    m_clipped = !fixed && m_next->m_clipped;
</del><ins>+    m_clipped = !fixed && m_ancestor->m_clipped;
</ins><span class="cx">     if (m_clipped)
</span><del>-        m_clipRect = m_next->m_clipRect;
</del><ins>+        m_clipRect = m_ancestor->m_clipRect;
</ins><span class="cx"> 
</span><span class="cx">     if (renderer->hasOverflowClip()) {
</span><span class="cx">         LayoutRect clipRect(toLayoutPoint(m_paintOffset) + renderer->view().layoutDelta(), renderer->cachedSizeForOverflowClip());
</span><span class="lines">@@ -89,9 +89,9 @@
</span><span class="cx">         m_isPaginated = true;
</span><span class="cx">     } else {
</span><span class="cx">         // If we don't establish a new page height, then propagate the old page height and offset down.
</span><del>-        m_pageLogicalHeight = m_next->m_pageLogicalHeight;
-        m_pageLogicalHeightChanged = m_next->m_pageLogicalHeightChanged;
-        m_pageOffset = m_next->m_pageOffset;
</del><ins>+        m_pageLogicalHeight = m_ancestor->m_pageLogicalHeight;
+        m_pageLogicalHeightChanged = m_ancestor->m_pageLogicalHeightChanged;
+        m_pageOffset = m_ancestor->m_pageOffset;
</ins><span class="cx">         
</span><span class="cx">         // Disable pagination for objects we don't support. For now this includes overflow:scroll/auto, inline blocks and
</span><span class="cx">         // writing mode roots.
</span><span class="lines">@@ -105,10 +105,10 @@
</span><span class="cx">     // Propagate line grid information.
</span><span class="cx">     propagateLineGridInfo(renderer);
</span><span class="cx"> 
</span><del>-    m_layoutDelta = m_next->m_layoutDelta;
</del><ins>+    m_layoutDelta = m_ancestor->m_layoutDelta;
</ins><span class="cx"> #if !ASSERT_DISABLED
</span><del>-    m_layoutDeltaXSaturated = m_next->m_layoutDeltaXSaturated;
-    m_layoutDeltaYSaturated = m_next->m_layoutDeltaYSaturated;
</del><ins>+    m_layoutDeltaXSaturated = m_ancestor->m_layoutDeltaXSaturated;
+    m_layoutDeltaYSaturated = m_ancestor->m_layoutDeltaYSaturated;
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     if (lineGrid() && (lineGrid()->style().writingMode() == renderer->style().writingMode()) && is<RenderMultiColumnFlow>(*renderer))
</span><span class="lines">@@ -148,8 +148,8 @@
</span><span class="cx"> 
</span><span class="cx"> void LayoutState::clearPaginationInformation()
</span><span class="cx"> {
</span><del>-    m_pageLogicalHeight = m_next->m_pageLogicalHeight;
-    m_pageOffset = m_next->m_pageOffset;
</del><ins>+    m_pageLogicalHeight = m_ancestor->m_pageLogicalHeight;
+    m_pageOffset = m_ancestor->m_pageOffset;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> LayoutUnit LayoutState::pageLogicalOffset(RenderBox* child, LayoutUnit childLogicalOffset) const
</span><span class="lines">@@ -163,12 +163,12 @@
</span><span class="cx"> {
</span><span class="cx">     // Disable line grids for objects we don't support. For now this includes overflow:scroll/auto, inline blocks and
</span><span class="cx">     // writing mode roots.
</span><del>-    if (!m_next || renderer->isUnsplittableForPagination())
</del><ins>+    if (!m_ancestor || renderer->isUnsplittableForPagination())
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    m_lineGrid = m_next->m_lineGrid;
-    m_lineGridOffset = m_next->m_lineGridOffset;
-    m_lineGridPaginationOrigin = m_next->m_lineGridPaginationOrigin;
</del><ins>+    m_lineGrid = m_ancestor->m_lineGrid;
+    m_lineGridOffset = m_ancestor->m_lineGridOffset;
+    m_lineGridPaginationOrigin = m_ancestor->m_lineGridPaginationOrigin;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void LayoutState::establishLineGrid(RenderBlockFlow* block)
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx">         if (m_lineGrid->style().lineGrid() == block->style().lineGrid())
</span><span class="cx">             return;
</span><span class="cx">         RenderBlockFlow* currentGrid = m_lineGrid;
</span><del>-        for (LayoutState* currentState = m_next.get(); currentState; currentState = currentState->m_next.get()) {
</del><ins>+        for (LayoutState* currentState = m_ancestor.get(); currentState; currentState = currentState->m_ancestor.get()) {
</ins><span class="cx">             if (currentState->m_lineGrid == currentGrid)
</span><span class="cx">                 continue;
</span><span class="cx">             currentGrid = currentState->m_lineGrid;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingLayoutStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/LayoutState.h (224349 => 224350)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/LayoutState.h     2017-11-02 19:17:25 UTC (rev 224349)
+++ trunk/Source/WebCore/rendering/LayoutState.h        2017-11-02 19:24:42 UTC (rev 224350)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">     {
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    LayoutState(std::unique_ptr<LayoutState>, RenderBox*, const LayoutSize& offset, LayoutUnit pageHeight, bool pageHeightChanged);
</del><ins>+    LayoutState(std::unique_ptr<LayoutState> ancestor, RenderBox*, const LayoutSize& offset, LayoutUnit pageHeight, bool pageHeightChanged);
</ins><span class="cx">     explicit LayoutState(RenderObject&);
</span><span class="cx"> 
</span><span class="cx">     void clearPaginationInformation();
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> 
</span><span class="cx">     // The current line grid that we're snapping to and the offset of the start of the grid.
</span><span class="cx">     RenderBlockFlow* m_lineGrid { nullptr };
</span><del>-    std::unique_ptr<LayoutState> m_next;
</del><ins>+    std::unique_ptr<LayoutState> m_ancestor;
</ins><span class="cx"> 
</span><span class="cx">     // FIXME: Distinguish between the layout clip rect and the paint clip rect which may be larger,
</span><span class="cx">     // e.g., because of composited scrolling.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.h (224349 => 224350)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.h      2017-11-02 19:17:25 UTC (rev 224349)
+++ trunk/Source/WebCore/rendering/RenderView.h 2017-11-02 19:24:42 UTC (rev 224350)
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx"> 
</span><span class="cx">     void popLayoutState()
</span><span class="cx">     {
</span><del>-        m_layoutState = WTFMove(m_layoutState->m_next);
</del><ins>+        m_layoutState = WTFMove(m_layoutState->m_ancestor);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     // Suspends the LayoutState optimization. Used under transforms that cannot be represented by
</span></span></pre>
</div>
</div>

</body>
</html>