<!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>[199552] 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/199552">199552</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-04-14 14:09:19 -0700 (Thu, 14 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Collapsed border cache invalidation can lead to O(n^2) during style resolve
https://bugs.webkit.org/show_bug.cgi?id=156570
Reviewed by Darin Adler.
RenderTable::invalidateCollapsedBorders traverses all cells. It is called when table cell border changes.
This can result in O(n^2) during style resolve.
* rendering/RenderTable.cpp:
(WebCore::RenderTable::layout):
(WebCore::RenderTable::invalidateCollapsedBorders):
For cell border style change invalidate the hasEmptyCollapsedBorder bits only for the neighbouring cells.
They are the only ones that can be affected.
* rendering/RenderTable.h:
(WebCore::RenderTable::collapsedBordersAreValid):
(WebCore::RenderTable::collapsedEmptyBorderIsPresent):
(WebCore::RenderTable::currentBorderValue):
* rendering/RenderTableCell.cpp:
(WebCore::RenderTableCell::styleDidChange):</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>
<li><a href="#trunkSourceWebCorerenderingRenderTableCellcpp">trunk/Source/WebCore/rendering/RenderTableCell.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199551 => 199552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-14 20:49:12 UTC (rev 199551)
+++ trunk/Source/WebCore/ChangeLog 2016-04-14 21:09:19 UTC (rev 199552)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-04-14 Antti Koivisto <antti@apple.com>
+
+ Collapsed border cache invalidation can lead to O(n^2) during style resolve
+ https://bugs.webkit.org/show_bug.cgi?id=156570
+
+ Reviewed by Darin Adler.
+
+ RenderTable::invalidateCollapsedBorders traverses all cells. It is called when table cell border changes.
+ This can result in O(n^2) during style resolve.
+
+ * rendering/RenderTable.cpp:
+ (WebCore::RenderTable::layout):
+ (WebCore::RenderTable::invalidateCollapsedBorders):
+
+ For cell border style change invalidate the hasEmptyCollapsedBorder bits only for the neighbouring cells.
+ They are the only ones that can be affected.
+
+ * rendering/RenderTable.h:
+ (WebCore::RenderTable::collapsedBordersAreValid):
+ (WebCore::RenderTable::collapsedEmptyBorderIsPresent):
+ (WebCore::RenderTable::currentBorderValue):
+ * rendering/RenderTableCell.cpp:
+ (WebCore::RenderTableCell::styleDidChange):
+
</ins><span class="cx"> 2016-04-14 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-grid] Implement CSSGridTemplateAreasValue::equals
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTable.cpp (199551 => 199552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTable.cpp 2016-04-14 20:49:12 UTC (rev 199551)
+++ trunk/Source/WebCore/rendering/RenderTable.cpp 2016-04-14 21:09:19 UTC (rev 199552)
</span><span class="lines">@@ -586,14 +586,32 @@
</span><span class="cx"> clearNeedsLayout();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderTable::invalidateCollapsedBorders()
</del><ins>+void RenderTable::invalidateCollapsedBorders(RenderTableCell* cellWithStyleChange)
</ins><span class="cx"> {
</span><span class="cx"> m_collapsedBordersValid = false;
</span><span class="cx"> m_collapsedBorders.clear();
</span><ins>+
+ for (auto& section : childrenOfType<RenderTableSection>(*this))
+ section.clearCachedCollapsedBorders();
+
+ if (!m_collapsedEmptyBorderIsPresent)
+ return;
+
+ if (cellWithStyleChange) {
+ // It is enough to invalidate just the surrounding cells when cell border style changes.
+ cellWithStyleChange->invalidateHasEmptyCollapsedBorders();
+ if (auto* below = cellBelow(cellWithStyleChange))
+ below->invalidateHasEmptyCollapsedBorders();
+ if (auto* above = cellAbove(cellWithStyleChange))
+ above->invalidateHasEmptyCollapsedBorders();
+ if (auto* before = cellBefore(cellWithStyleChange))
+ before->invalidateHasEmptyCollapsedBorders();
+ if (auto* after = cellAfter(cellWithStyleChange))
+ after->invalidateHasEmptyCollapsedBorders();
+ return;
+ }
+
</ins><span class="cx"> for (auto& section : childrenOfType<RenderTableSection>(*this)) {
</span><del>- section.clearCachedCollapsedBorders();
- if (!m_collapsedEmptyBorderIsPresent)
- continue;
</del><span class="cx"> for (auto* row = section.firstRow(); row; row = row->nextRow()) {
</span><span class="cx"> for (auto* cell = row->firstCell(); cell; cell = cell->nextCell()) {
</span><span class="cx"> ASSERT(cell->table() == this);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTable.h (199551 => 199552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTable.h 2016-04-14 20:49:12 UTC (rev 199551)
+++ trunk/Source/WebCore/rendering/RenderTable.h 2016-04-14 21:09:19 UTC (rev 199552)
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx">
</span><span class="cx"> typedef Vector<CollapsedBorderValue> CollapsedBorderValues;
</span><span class="cx"> bool collapsedBordersAreValid() const { return m_collapsedBordersValid; }
</span><del>- void invalidateCollapsedBorders();
</del><ins>+ void invalidateCollapsedBorders(RenderTableCell* cellWithStyleChange = nullptr);
</ins><span class="cx"> void collapsedEmptyBorderIsPresent() { m_collapsedEmptyBorderIsPresent = true; }
</span><span class="cx"> const CollapsedBorderValue* currentBorderValue() const { return m_currentBorder; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableCellcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableCell.cpp (199551 => 199552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableCell.cpp 2016-04-14 20:49:12 UTC (rev 199551)
+++ trunk/Source/WebCore/rendering/RenderTableCell.cpp 2016-04-14 21:09:19 UTC (rev 199552)
</span><span class="lines">@@ -423,7 +423,7 @@
</span><span class="cx"> // If border was changed, notify table.
</span><span class="cx"> RenderTable* table = this->table();
</span><span class="cx"> if (table && oldStyle && oldStyle->border() != style().border())
</span><del>- table->invalidateCollapsedBorders();
</del><ins>+ table->invalidateCollapsedBorders(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // The following rules apply for resolving conflicts and figuring out which border
</span></span></pre>
</div>
</div>
</body>
</html>