<!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>[179954] branches/safari-600.5-branch</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/179954">179954</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-02-11 13:33:31 -0800 (Wed, 11 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/179627">r179627</a>. rdar://problem/19720096</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6005branchLayoutTestsChangeLog">branches/safari-600.5-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreChangeLog">branches/safari-600.5-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceWebCorerenderingRenderBlockcpp">branches/safari-600.5-branch/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorerenderingRenderBlockh">branches/safari-600.5-branch/Source/WebCore/rendering/RenderBlock.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorerenderingRenderBlockFlowcpp">branches/safari-600.5-branch/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorerenderingRenderDeprecatedFlexibleBoxcpp">branches/safari-600.5-branch/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorerenderingRenderTablecpp">branches/safari-600.5-branch/Source/WebCore/rendering/RenderTable.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorerenderingRenderTableh">branches/safari-600.5-branch/Source/WebCore/rendering/RenderTable.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorerenderingRenderTableRowcpp">branches/safari-600.5-branch/Source/WebCore/rendering/RenderTableRow.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorerenderingRenderTableSectioncpp">branches/safari-600.5-branch/Source/WebCore/rendering/RenderTableSection.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6005branchLayoutTestsfastmulticoltabledynamicmovementexpectedhtml">branches/safari-600.5-branch/LayoutTests/fast/multicol/table-dynamic-movement-expected.html</a></li>
<li><a href="#branchessafari6005branchLayoutTestsfastmulticoltabledynamicmovementhtml">branches/safari-600.5-branch/LayoutTests/fast/multicol/table-dynamic-movement.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6005branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/LayoutTests/ChangeLog (179953 => 179954)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/LayoutTests/ChangeLog 2015-02-11 21:28:43 UTC (rev 179953)
+++ branches/safari-600.5-branch/LayoutTests/ChangeLog 2015-02-11 21:33:31 UTC (rev 179954)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2015-02-11 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r179627
+
+ 2015-02-03 David Hyatt <hyatt@apple.com>
+
+ Tables don't repaginate properly when the pagination height changes or the pagination offset changes.
+ https://bugs.webkit.org/show_bug.cgi?id=141207
+ <rdar://problem/18387659>
+
+ Reviewed by Dean Jackson.
+
+ * fast/multicol/table-dynamic-movement-expected.html: Added.
+ * fast/multicol/table-dynamic-movement.html: Added.
+
+2015-02-11 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r179597
</span><span class="cx">
</span><span class="cx"> 2015-02-03 Maciej Stachowiak <mjs@apple.com>
</span></span></pre></div>
<a id="branchessafari6005branchLayoutTestsfastmulticoltabledynamicmovementexpectedhtmlfromrev179627trunkLayoutTestsfastmulticoltabledynamicmovementexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.5-branch/LayoutTests/fast/multicol/table-dynamic-movement-expected.html (from rev 179627, trunk/LayoutTests/fast/multicol/table-dynamic-movement-expected.html) (0 => 179954)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/LayoutTests/fast/multicol/table-dynamic-movement-expected.html (rev 0)
+++ branches/safari-600.5-branch/LayoutTests/fast/multicol/table-dynamic-movement-expected.html 2015-02-11 21:33:31 UTC (rev 179954)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+
+<div id='test' style="-webkit-columns:2; height:500px; border:3px solid black; -webkit-column-fill: auto"><div style="height:150px; background-color:lime"></div>
+
+<table style="height:300px"><tr><td style="vertical-align:middle; height:100%">Hello world<br><img style="height:250px;width:175px; background-color:purple">
+<td style="vertical-align:middle; height:100%">Also world<br>
+<img style="height:250px;width:175px; background-color:purple">
+</table>
+
+</div>
</ins></span></pre></div>
<a id="branchessafari6005branchLayoutTestsfastmulticoltabledynamicmovementhtmlfromrev179627trunkLayoutTestsfastmulticoltabledynamicmovementhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.5-branch/LayoutTests/fast/multicol/table-dynamic-movement.html (from rev 179627, trunk/LayoutTests/fast/multicol/table-dynamic-movement.html) (0 => 179954)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/LayoutTests/fast/multicol/table-dynamic-movement.html (rev 0)
+++ branches/safari-600.5-branch/LayoutTests/fast/multicol/table-dynamic-movement.html 2015-02-11 21:33:31 UTC (rev 179954)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+
+<script>
+function doIt()
+{
+document.getElementById('test').offsetHeight
+document.getElementById('test').style.height = '500px';
+}
+</script>
+
+<div id='test' style="-webkit-columns:2; height:400px; border:3px solid black; -webkit-column-fill: auto"><div style="height:150px; background-color:lime"></div>
+
+<table style="height:300px"><tr><td style="vertical-align:middle; height:100%">Hello world<br><img style="height:250px;width:175px; background-color:purple">
+<td style="vertical-align:middle; height:100%">Also world<br>
+<img style="height:250px;width:175px; background-color:purple">
+</table>
+
+</div>
+
+<script>
+doIt()
+</script>
</ins></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (179953 => 179954)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-02-11 21:28:43 UTC (rev 179953)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-02-11 21:33:31 UTC (rev 179954)
</span><span class="lines">@@ -1,5 +1,45 @@
</span><span class="cx"> 2015-02-11 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r179627
+
+ 2015-02-03 David Hyatt <hyatt@apple.com>
+
+ Tables don't repaginate properly when the pagination height changes or the pagination offset changes.
+ https://bugs.webkit.org/show_bug.cgi?id=141207
+ <rdar://problem/18387659>
+
+ Reviewed by Dean Jackson.
+
+ Added fast/multicol/table-dynamic-movement.html
+
+ Change markForPaginationRelayoutIfNeeded to be called always and to check needsLayout inside it.
+
+ Make RenderTable override markForPaginationRelayoutIfNeeded and also dirty the sections if the table
+ ended up getting marked for relayout.
+
+ Make sure rows do the right thing as well.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::layoutPositionedObjects):
+ (WebCore::RenderBlock::markForPaginationRelayoutIfNeeded):
+ * rendering/RenderBlock.h:
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::layoutBlockChild):
+ (WebCore::RenderBlockFlow::adjustBlockChildForPagination):
+ (WebCore::RenderBlockFlow::positionNewFloats):
+ * rendering/RenderDeprecatedFlexibleBox.cpp:
+ (WebCore::RenderDeprecatedFlexibleBox::layoutHorizontalBox):
+ (WebCore::RenderDeprecatedFlexibleBox::layoutVerticalBox):
+ * rendering/RenderTable.cpp:
+ (WebCore::RenderTable::markForPaginationRelayoutIfNeeded):
+ * rendering/RenderTable.h:
+ * rendering/RenderTableRow.cpp:
+ (WebCore::RenderTableRow::layout):
+ * rendering/RenderTableSection.cpp:
+ (WebCore::RenderTableSection::layout):
+
+2015-02-11 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r179597
</span><span class="cx">
</span><span class="cx"> 2015-02-03 Maciej Stachowiak <mjs@apple.com>
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/rendering/RenderBlock.cpp (179953 => 179954)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/rendering/RenderBlock.cpp 2015-02-11 21:28:43 UTC (rev 179953)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/RenderBlock.cpp 2015-02-11 21:33:31 UTC (rev 179954)
</span><span class="lines">@@ -1432,8 +1432,7 @@
</span><span class="cx"> if (relayoutChildren && r.needsPreferredWidthsRecalculation())
</span><span class="cx"> r.setPreferredLogicalWidthsDirty(true, MarkOnlyThis);
</span><span class="cx">
</span><del>- if (!r.needsLayout())
- r.markForPaginationRelayoutIfNeeded();
</del><ins>+ r.markForPaginationRelayoutIfNeeded();
</ins><span class="cx">
</span><span class="cx"> // We don't have to do a full layout. We just have to update our position. Try that first. If we have shrink-to-fit width
</span><span class="cx"> // and we hit the available width constraint, the layoutIfNeeded() will catch it and do a full layout.
</span><span class="lines">@@ -1481,8 +1480,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderBlock::markForPaginationRelayoutIfNeeded()
</span><span class="cx"> {
</span><del>- ASSERT(!needsLayout());
- if (needsLayout())
</del><ins>+ if (needsLayout() || !view().layoutState()->isPaginated())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (view().layoutState()->pageLogicalHeightChanged() || (view().layoutState()->pageLogicalHeight() && view().layoutState()->pageLogicalOffset(this, logicalTop()) != pageLogicalOffset()))
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorerenderingRenderBlockh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/rendering/RenderBlock.h (179953 => 179954)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/rendering/RenderBlock.h 2015-02-11 21:28:43 UTC (rev 179953)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/RenderBlock.h 2015-02-11 21:33:31 UTC (rev 179954)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> bool generatesLineBoxesForInlineChild(RenderObject*);
</span><span class="cx">
</span><span class="cx"> void markPositionedObjectsForLayout();
</span><del>- virtual void markForPaginationRelayoutIfNeeded() override final;
</del><ins>+ virtual void markForPaginationRelayoutIfNeeded() override;
</ins><span class="cx">
</span><span class="cx"> // FIXME-BLOCKFLOW: Remove virtualizaion when all of the line layout code has been moved out of RenderBlock
</span><span class="cx"> virtual bool containsFloats() const { return false; }
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/rendering/RenderBlockFlow.cpp (179953 => 179954)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/rendering/RenderBlockFlow.cpp 2015-02-11 21:28:43 UTC (rev 179953)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/RenderBlockFlow.cpp 2015-02-11 21:33:31 UTC (rev 179954)
</span><span class="lines">@@ -704,8 +704,7 @@
</span><span class="cx"> previousFloatLogicalBottom = std::max(previousFloatLogicalBottom, oldLogicalTop + childBlockFlow->lowestFloatLogicalBottom());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!child.needsLayout())
- child.markForPaginationRelayoutIfNeeded();
</del><ins>+ child.markForPaginationRelayoutIfNeeded();
</ins><span class="cx">
</span><span class="cx"> bool childHadLayout = child.everHadLayout();
</span><span class="cx"> bool childNeededLayout = child.needsLayout();
</span><span class="lines">@@ -743,8 +742,7 @@
</span><span class="cx"> if (childBlockFlow) {
</span><span class="cx"> if (!child.avoidsFloats() && childBlockFlow->containsFloats())
</span><span class="cx"> childBlockFlow->markAllDescendantsWithFloatsForLayout();
</span><del>- if (!child.needsLayout())
- child.markForPaginationRelayoutIfNeeded();
</del><ins>+ child.markForPaginationRelayoutIfNeeded();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1542,8 +1540,7 @@
</span><span class="cx"> if (childRenderBlock) {
</span><span class="cx"> if (!child.avoidsFloats() && childRenderBlock->containsFloats())
</span><span class="cx"> toRenderBlockFlow(childRenderBlock)->markAllDescendantsWithFloatsForLayout();
</span><del>- if (!child.needsLayout())
- child.markForPaginationRelayoutIfNeeded();
</del><ins>+ child.markForPaginationRelayoutIfNeeded();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Our guess was wrong. Make the child lay itself out again.
</span><span class="lines">@@ -2427,13 +2424,11 @@
</span><span class="cx">
</span><span class="cx"> estimateRegionRangeForBoxChild(childBox);
</span><span class="cx">
</span><ins>+ childBox.markForPaginationRelayoutIfNeeded();
+ childBox.layoutIfNeeded();
+
</ins><span class="cx"> LayoutState* layoutState = view().layoutState();
</span><span class="cx"> bool isPaginated = layoutState->isPaginated();
</span><del>- if (isPaginated && !childBox.needsLayout())
- childBox.markForPaginationRelayoutIfNeeded();
-
- childBox.layoutIfNeeded();
-
</del><span class="cx"> if (isPaginated) {
</span><span class="cx"> // If we are unsplittable and don't fit, then we need to move down.
</span><span class="cx"> // We include our margins as part of the unsplittable area.
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorerenderingRenderDeprecatedFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (179953 => 179954)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2015-02-11 21:28:43 UTC (rev 179953)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2015-02-11 21:33:31 UTC (rev 179954)
</span><span class="lines">@@ -423,8 +423,7 @@
</span><span class="cx"> // Compute the child's vertical margins.
</span><span class="cx"> child->computeAndSetBlockDirectionMargins(this);
</span><span class="cx">
</span><del>- if (!child->needsLayout())
- child->markForPaginationRelayoutIfNeeded();
</del><ins>+ child->markForPaginationRelayoutIfNeeded();
</ins><span class="cx">
</span><span class="cx"> // Apply the child's current layout delta.
</span><span class="cx"> layoutChildIfNeededApplyingDelta(child, childLayoutDelta);
</span><span class="lines">@@ -499,8 +498,7 @@
</span><span class="cx"> if (oldChildHeight != child->height())
</span><span class="cx"> child->setChildNeedsLayout(MarkOnlyThis);
</span><span class="cx">
</span><del>- if (!child->needsLayout())
- child->markForPaginationRelayoutIfNeeded();
</del><ins>+ child->markForPaginationRelayoutIfNeeded();
</ins><span class="cx">
</span><span class="cx"> layoutChildIfNeededApplyingDelta(child, childLayoutDelta);
</span><span class="cx">
</span><span class="lines">@@ -744,8 +742,7 @@
</span><span class="cx"> // Add in the child's marginTop to our height.
</span><span class="cx"> setHeight(height() + child->marginTop());
</span><span class="cx">
</span><del>- if (!child->needsLayout())
- child->markForPaginationRelayoutIfNeeded();
</del><ins>+ child->markForPaginationRelayoutIfNeeded();
</ins><span class="cx">
</span><span class="cx"> // Now do a layout.
</span><span class="cx"> layoutChildIfNeededApplyingDelta(child, childLayoutDelta);
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorerenderingRenderTablecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/rendering/RenderTable.cpp (179953 => 179954)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/rendering/RenderTable.cpp 2015-02-11 21:28:43 UTC (rev 179953)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/RenderTable.cpp 2015-02-11 21:33:31 UTC (rev 179954)
</span><span class="lines">@@ -1540,4 +1540,18 @@
</span><span class="cx"> return style().borderStart();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderTable::markForPaginationRelayoutIfNeeded()
+{
+ if (!view().layoutState()->isPaginated() || (!view().layoutState()->pageLogicalHeightChanged() && (!view().layoutState()->pageLogicalHeight() || view().layoutState()->pageLogicalOffset(this, logicalTop()) == pageLogicalOffset())))
+ return;
+
+ // When a table moves, we have to dirty all of the sections too.
+ if (!needsLayout())
+ setChildNeedsLayout(MarkOnlyThis);
+ for (auto& child : childrenOfType<RenderTableSection>(*this)) {
+ if (!child.needsLayout())
+ child.setChildNeedsLayout(MarkOnlyThis);
+ }
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="branchessafari6005branchSourceWebCorerenderingRenderTableh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/rendering/RenderTable.h (179953 => 179954)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/rendering/RenderTable.h 2015-02-11 21:28:43 UTC (rev 179953)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/RenderTable.h 2015-02-11 21:33:31 UTC (rev 179954)
</span><span class="lines">@@ -275,7 +275,9 @@
</span><span class="cx"> LayoutUnit offsetLeftForColumn(const RenderTableCol&) const;
</span><span class="cx"> LayoutUnit offsetWidthForColumn(const RenderTableCol&) const;
</span><span class="cx"> LayoutUnit offsetHeightForColumn(const RenderTableCol&) const;
</span><del>-
</del><ins>+
+ virtual void markForPaginationRelayoutIfNeeded() override final;
+
</ins><span class="cx"> protected:
</span><span class="cx"> virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override final;
</span><span class="cx"> virtual void simplifiedNormalFlowLayout() override final;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorerenderingRenderTableRowcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/rendering/RenderTableRow.cpp (179953 => 179954)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/rendering/RenderTableRow.cpp 2015-02-11 21:28:43 UTC (rev 179953)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/RenderTableRow.cpp 2015-02-11 21:33:31 UTC (rev 179954)
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> bool paginated = view().layoutState()->isPaginated();
</span><span class="cx">
</span><span class="cx"> for (RenderTableCell* cell = firstCell(); cell; cell = cell->nextCell()) {
</span><del>- if (!cell->needsLayout() && paginated && view().layoutState()->pageLogicalHeight() && view().layoutState()->pageLogicalOffset(cell, cell->logicalTop()) != cell->pageLogicalOffset())
</del><ins>+ if (!cell->needsLayout() && paginated && (view().layoutState()->pageLogicalHeightChanged() || (view().layoutState()->pageLogicalHeight() && view().layoutState()->pageLogicalOffset(cell, cell->logicalTop()) != cell->pageLogicalOffset())))
</ins><span class="cx"> cell->setChildNeedsLayout(MarkOnlyThis);
</span><span class="cx">
</span><span class="cx"> if (cell->needsLayout()) {
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorerenderingRenderTableSectioncpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/rendering/RenderTableSection.cpp (179953 => 179954)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/rendering/RenderTableSection.cpp 2015-02-11 21:28:43 UTC (rev 179953)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/RenderTableSection.cpp 2015-02-11 21:33:31 UTC (rev 179954)
</span><span class="lines">@@ -391,9 +391,10 @@
</span><span class="cx"> m_grid.shrinkToFit();
</span><span class="cx">
</span><span class="cx"> LayoutStateMaintainer statePusher(view(), *this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
</span><del>-
</del><ins>+ bool paginated = view().layoutState()->isPaginated();
+
</ins><span class="cx"> const Vector<int>& columnPos = table()->columnPositions();
</span><del>-
</del><ins>+
</ins><span class="cx"> for (unsigned r = 0; r < m_grid.size(); ++r) {
</span><span class="cx"> Row& row = m_grid[r].row;
</span><span class="cx"> unsigned cols = row.size();
</span><span class="lines">@@ -416,8 +417,12 @@
</span><span class="cx"> cell->setCellLogicalWidth(tableLayoutLogicalWidth);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (RenderTableRow* rowRenderer = m_grid[r].rowRenderer)
</del><ins>+ if (RenderTableRow* rowRenderer = m_grid[r].rowRenderer) {
+ if (!rowRenderer->needsLayout() && paginated && view().layoutState()->pageLogicalHeightChanged())
+ rowRenderer->setChildNeedsLayout(MarkOnlyThis);
+
</ins><span class="cx"> rowRenderer->layoutIfNeeded();
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> statePusher.pop();
</span></span></pre>
</div>
</div>
</body>
</html>