<!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>[208281] 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/208281">208281</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-11-02 07:17:21 -0700 (Wed, 02 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Tables] Simplified layout skips captions.
https://bugs.webkit.org/show_bug.cgi?id=164284
Reviewed by David Hyatt.
This patch ensures that we take care of simplified normalflow captions during layout.
Covered by fast/regions/table-caption-as-region.html
* rendering/RenderTable.cpp:
(WebCore::RenderTable::layoutCaption):
(WebCore::RenderTable::layoutCaptions): _caption_side is 2bits, can't use bitmask.
(WebCore::RenderTable::simplifiedNormalFlowLayout):
(WebCore::RenderTable::layout):
* rendering/RenderTable.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTablecpp">trunk/Source/WebCore/rendering/RenderTable.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableh">trunk/Source/WebCore/rendering/RenderTable.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208280 => 208281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-02 13:38:54 UTC (rev 208280)
+++ trunk/Source/WebCore/ChangeLog 2016-11-02 14:17:21 UTC (rev 208281)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-11-02 Zalan Bujtas <zalan@apple.com>
+
+ [Tables] Simplified layout skips captions.
+ https://bugs.webkit.org/show_bug.cgi?id=164284
+
+ Reviewed by David Hyatt.
+
+ This patch ensures that we take care of simplified normalflow captions during layout.
+
+ Covered by fast/regions/table-caption-as-region.html
+
+ * rendering/RenderTable.cpp:
+ (WebCore::RenderTable::layoutCaption):
+ (WebCore::RenderTable::layoutCaptions): _caption_side is 2bits, can't use bitmask.
+ (WebCore::RenderTable::simplifiedNormalFlowLayout):
+ (WebCore::RenderTable::layout):
+ * rendering/RenderTable.h:
+
</ins><span class="cx"> 2016-11-02 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r207753-207755): ASSERTION FAILED: m_parsedStyleSheetCache->isInMemoryCache()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTable.cpp (208280 => 208281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTable.cpp 2016-11-02 13:38:54 UTC (rev 208280)
+++ trunk/Source/WebCore/rendering/RenderTable.cpp 2016-11-02 14:17:21 UTC (rev 208281)
</span><span class="lines">@@ -381,26 +381,39 @@
</span><span class="cx"> return LayoutUnit();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderTable::layoutCaption(RenderTableCaption* caption)
</del><ins>+void RenderTable::layoutCaption(RenderTableCaption& caption)
</ins><span class="cx"> {
</span><del>- LayoutRect captionRect(caption->frameRect());
</del><ins>+ LayoutRect captionRect(caption.frameRect());
</ins><span class="cx">
</span><del>- if (caption->needsLayout()) {
</del><ins>+ if (caption.needsLayout()) {
</ins><span class="cx"> // The margins may not be available but ensure the caption is at least located beneath any previous sibling caption
</span><span class="cx"> // so that it does not mistakenly think any floats in the previous caption intrude into it.
</span><del>- caption->setLogicalLocation(LayoutPoint(caption->marginStart(), caption->marginBefore() + logicalHeight()));
</del><ins>+ caption.setLogicalLocation(LayoutPoint(caption.marginStart(), caption.marginBefore() + logicalHeight()));
</ins><span class="cx"> // If RenderTableCaption ever gets a layout() function, use it here.
</span><del>- caption->layoutIfNeeded();
</del><ins>+ caption.layoutIfNeeded();
</ins><span class="cx"> }
</span><span class="cx"> // Apply the margins to the location now that they are definitely available from layout
</span><del>- caption->setLogicalLocation(LayoutPoint(caption->marginStart(), caption->marginBefore() + logicalHeight()));
</del><ins>+ caption.setLogicalLocation(LayoutPoint(caption.marginStart(), caption.marginBefore() + logicalHeight()));
</ins><span class="cx">
</span><del>- if (!selfNeedsLayout() && caption->checkForRepaintDuringLayout())
- caption->repaintDuringLayoutIfMoved(captionRect);
</del><ins>+ if (!selfNeedsLayout() && caption.checkForRepaintDuringLayout())
+ caption.repaintDuringLayoutIfMoved(captionRect);
</ins><span class="cx">
</span><del>- setLogicalHeight(logicalHeight() + caption->logicalHeight() + caption->marginBefore() + caption->marginAfter());
</del><ins>+ setLogicalHeight(logicalHeight() + caption.logicalHeight() + caption.marginBefore() + caption.marginAfter());
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderTable::layoutCaptions(BottomCaptionLayoutPhase bottomCaptionLayoutPhase)
+{
+ if (m_captions.isEmpty())
+ return;
+ // FIXME: Collapse caption margin.
+ for (unsigned i = 0; i < m_captions.size(); ++i) {
+ if ((bottomCaptionLayoutPhase == BottomCaptionLayoutPhase::Yes && m_captions[i]->style().captionSide() != CAPBOTTOM)
+ || (bottomCaptionLayoutPhase == BottomCaptionLayoutPhase::No && m_captions[i]->style().captionSide() == CAPBOTTOM))
+ continue;
+ layoutCaption(*m_captions[i]);
+ }
+}
+
</ins><span class="cx"> void RenderTable::distributeExtraLogicalHeight(LayoutUnit extraLogicalHeight)
</span><span class="cx"> {
</span><span class="cx"> if (extraLogicalHeight <= 0)
</span><span class="lines">@@ -417,10 +430,12 @@
</span><span class="cx">
</span><span class="cx"> void RenderTable::simplifiedNormalFlowLayout()
</span><span class="cx"> {
</span><ins>+ layoutCaptions();
</ins><span class="cx"> for (RenderTableSection* section = topSection(); section; section = sectionBelow(section)) {
</span><span class="cx"> section->layoutIfNeeded();
</span><span class="cx"> section->computeOverflowFromCells();
</span><span class="cx"> }
</span><ins>+ layoutCaptions(BottomCaptionLayoutPhase::Yes);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderTable::layout()
</span><span class="lines">@@ -484,17 +499,10 @@
</span><span class="cx"> bool sectionMoved = false;
</span><span class="cx"> LayoutUnit movedSectionLogicalTop = 0;
</span><span class="cx">
</span><del>- // FIXME: Collapse caption margin.
- if (!m_captions.isEmpty()) {
- for (unsigned i = 0; i < m_captions.size(); i++) {
- if (m_captions[i]->style().captionSide() == CAPBOTTOM)
- continue;
- layoutCaption(m_captions[i]);
- }
- if (logicalHeight() != oldTableLogicalTop) {
- sectionMoved = true;
- movedSectionLogicalTop = std::min(logicalHeight(), oldTableLogicalTop);
- }
</del><ins>+ layoutCaptions();
+ if (!m_captions.isEmpty() && logicalHeight() != oldTableLogicalTop) {
+ sectionMoved = true;
+ movedSectionLogicalTop = std::min(logicalHeight(), oldTableLogicalTop);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit borderAndPaddingBefore = borderBefore() + (collapsing ? LayoutUnit() : paddingBefore());
</span><span class="lines">@@ -553,11 +561,7 @@
</span><span class="cx">
</span><span class="cx"> setLogicalHeight(logicalHeight() + borderAndPaddingAfter);
</span><span class="cx">
</span><del>- for (unsigned i = 0; i < m_captions.size(); i++) {
- if (m_captions[i]->style().captionSide() != CAPBOTTOM)
- continue;
- layoutCaption(m_captions[i]);
- }
</del><ins>+ layoutCaptions(BottomCaptionLayoutPhase::Yes);
</ins><span class="cx">
</span><span class="cx"> if (isOutOfFlowPositioned())
</span><span class="cx"> updateLogicalHeight();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTable.h (208280 => 208281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTable.h 2016-11-02 13:38:54 UTC (rev 208280)
+++ trunk/Source/WebCore/rendering/RenderTable.h 2016-11-02 14:17:21 UTC (rev 208281)
</span><span class="lines">@@ -319,7 +319,9 @@
</span><span class="cx">
</span><span class="cx"> void recalcCollapsedBorders();
</span><span class="cx"> void recalcSections() const;
</span><del>- void layoutCaption(RenderTableCaption*);
</del><ins>+ enum class BottomCaptionLayoutPhase { Yes, No };
+ void layoutCaptions(BottomCaptionLayoutPhase = BottomCaptionLayoutPhase::No);
+ void layoutCaption(RenderTableCaption&);
</ins><span class="cx">
</span><span class="cx"> void distributeExtraLogicalHeight(LayoutUnit extraLogicalHeight);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>