<!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>[201159] trunk</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/201159">201159</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-05-19 06:22:18 -0700 (Thu, 19 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Style resolution for explicitly inherited properties is inefficient
https://bugs.webkit.org/show_bug.cgi?id=157860
Reviewed by Andreas Kling.
Source/WebCore:
We mark the parent style with hasExplicitlyInheritedProperties bit rather than the style that is actually
affected by inherited properties. This leads to various inefficiencies including unnecessarily wide style recalcs.
* css/StyleResolver.cpp:
(WebCore::isCacheableInMatchedPropertiesCache):
Check the style itself rather than the parent. This allows more caching.
(WebCore::StyleResolver::applyProperty):
Mark the style rather than the parent.
* style/StyleChange.cpp:
(WebCore::Style::determineChange):
Remove hasExplicitlyInheritedProperties test and just return NoInherit. Having explicitly inherited
properties doesn't make the children inherit them automatically.
This allows smaller style recalcs.
* style/StyleTreeResolver.cpp:
(WebCore::Style::TreeResolver::resolveElement):
This patch exposed a bug with appearance property in meter and progress elements.
They may construct different renderer based on appearance so we need to force
render tree reconstruction when it changes.
(WebCore::Style::TreeResolver::popParentsToDepth):
(WebCore::Style::shouldResolvePseudoElement):
Don't clear the style recalc bits here.
(WebCore::Style::shouldResolveElement):
Add a helper.
If the parent had a NoInherit style change, test if the element has existing style with
hasExplicitlyInheritedProperties bit. If so we need to re-resolve this element.
(WebCore::Style::clearNeedsStyleResolution):
Also clear pseudo elements.
(WebCore::Style::TreeResolver::resolveComposedTree):
LayoutTests:
* platform/ios-simulator/fast/dom/HTMLProgressElement/progress-bar-value-pseudo-element-expected.txt:
* platform/mac/fast/dom/HTMLProgressElement/progress-bar-value-pseudo-element-expected.txt:
This is a progression.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorfastdomHTMLProgressElementprogressbarvaluepseudoelementexpectedtxt">trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLProgressElement/progress-bar-value-pseudo-element-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastdomHTMLProgressElementprogressbarvaluepseudoelementexpectedtxt">trunk/LayoutTests/platform/mac/fast/dom/HTMLProgressElement/progress-bar-value-pseudo-element-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleChangecpp">trunk/Source/WebCore/style/StyleChange.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleTreeResolvercpp">trunk/Source/WebCore/style/StyleTreeResolver.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201158 => 201159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-19 12:03:16 UTC (rev 201158)
+++ trunk/LayoutTests/ChangeLog 2016-05-19 13:22:18 UTC (rev 201159)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-05-18 Antti Koivisto <antti@apple.com>
+
+ Style resolution for explicitly inherited properties is inefficient
+ https://bugs.webkit.org/show_bug.cgi?id=157860
+
+ Reviewed by Andreas Kling.
+
+ * platform/ios-simulator/fast/dom/HTMLProgressElement/progress-bar-value-pseudo-element-expected.txt:
+ * platform/mac/fast/dom/HTMLProgressElement/progress-bar-value-pseudo-element-expected.txt:
+
+ This is a progression.
+
</ins><span class="cx"> 2016-05-19 Yoav Weiss <yoav@yoav.ws>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r200887): LayoutTest http/tests/performance/performance-resource-timing-cached-entries.html is flaky
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorfastdomHTMLProgressElementprogressbarvaluepseudoelementexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLProgressElement/progress-bar-value-pseudo-element-expected.txt (201158 => 201159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLProgressElement/progress-bar-value-pseudo-element-expected.txt 2016-05-19 12:03:16 UTC (rev 201158)
+++ trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLProgressElement/progress-bar-value-pseudo-element-expected.txt 2016-05-19 13:22:18 UTC (rev 201159)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> RenderListMarker at (-18,0) size 7x19: bullet
</span><span class="cx"> RenderText {#text} at (0,0) size 235x19
</span><span class="cx"> text run at (0,0) width 235: "Removing appearance dynamically: "
</span><del>- RenderProgress {PROGRESS} at (234,2) size 161x17
</del><ins>+ RenderBlock {PROGRESS} at (234,2) size 161x17
</ins><span class="cx"> RenderProgress {DIV} at (0,0) size 160x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 160x16 [bgcolor=#808080]
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 112x16 [bgcolor=#008000]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastdomHTMLProgressElementprogressbarvaluepseudoelementexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/dom/HTMLProgressElement/progress-bar-value-pseudo-element-expected.txt (201158 => 201159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/dom/HTMLProgressElement/progress-bar-value-pseudo-element-expected.txt 2016-05-19 12:03:16 UTC (rev 201158)
+++ trunk/LayoutTests/platform/mac/fast/dom/HTMLProgressElement/progress-bar-value-pseudo-element-expected.txt 2016-05-19 13:22:18 UTC (rev 201159)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> RenderListMarker at (-17,0) size 7x18: bullet
</span><span class="cx"> RenderText {#text} at (0,0) size 235x18
</span><span class="cx"> text run at (0,0) width 235: "Removing appearance dynamically: "
</span><del>- RenderProgress {PROGRESS} at (234,1) size 161x17
</del><ins>+ RenderBlock {PROGRESS} at (234,1) size 161x17
</ins><span class="cx"> RenderProgress {DIV} at (0,0) size 160x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 160x16 [bgcolor=#808080]
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 112x16 [bgcolor=#008000]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201158 => 201159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-19 12:03:16 UTC (rev 201158)
+++ trunk/Source/WebCore/ChangeLog 2016-05-19 13:22:18 UTC (rev 201159)
</span><span class="lines">@@ -1,3 +1,54 @@
</span><ins>+2016-05-18 Antti Koivisto <antti@apple.com>
+
+ Style resolution for explicitly inherited properties is inefficient
+ https://bugs.webkit.org/show_bug.cgi?id=157860
+
+ Reviewed by Andreas Kling.
+
+ We mark the parent style with hasExplicitlyInheritedProperties bit rather than the style that is actually
+ affected by inherited properties. This leads to various inefficiencies including unnecessarily wide style recalcs.
+
+ * css/StyleResolver.cpp:
+ (WebCore::isCacheableInMatchedPropertiesCache):
+
+ Check the style itself rather than the parent. This allows more caching.
+
+ (WebCore::StyleResolver::applyProperty):
+
+ Mark the style rather than the parent.
+
+ * style/StyleChange.cpp:
+ (WebCore::Style::determineChange):
+
+ Remove hasExplicitlyInheritedProperties test and just return NoInherit. Having explicitly inherited
+ properties doesn't make the children inherit them automatically.
+
+ This allows smaller style recalcs.
+
+ * style/StyleTreeResolver.cpp:
+ (WebCore::Style::TreeResolver::resolveElement):
+
+ This patch exposed a bug with appearance property in meter and progress elements.
+ They may construct different renderer based on appearance so we need to force
+ render tree reconstruction when it changes.
+
+ (WebCore::Style::TreeResolver::popParentsToDepth):
+ (WebCore::Style::shouldResolvePseudoElement):
+
+ Don't clear the style recalc bits here.
+
+ (WebCore::Style::shouldResolveElement):
+
+ Add a helper.
+ If the parent had a NoInherit style change, test if the element has existing style with
+ hasExplicitlyInheritedProperties bit. If so we need to re-resolve this element.
+
+ (WebCore::Style::clearNeedsStyleResolution):
+
+ Also clear pseudo elements.
+
+ (WebCore::Style::TreeResolver::resolveComposedTree):
+
</ins><span class="cx"> 2016-05-19 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Refactor toJS functions to use toJSNewlyCreated
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (201158 => 201159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2016-05-19 12:03:16 UTC (rev 201158)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2016-05-19 13:22:18 UTC (rev 201159)
</span><span class="lines">@@ -1255,7 +1255,7 @@
</span><span class="cx"> if (style->writingMode() != RenderStyle::initialWritingMode() || style->direction() != RenderStyle::initialDirection())
</span><span class="cx"> return false;
</span><span class="cx"> // The cache assumes static knowledge about which properties are inherited.
</span><del>- if (parentStyle->hasExplicitlyInheritedProperties())
</del><ins>+ if (style->hasExplicitlyInheritedProperties())
</ins><span class="cx"> return false;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -1636,8 +1636,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (isInherit && !state.parentStyle()->hasExplicitlyInheritedProperties() && !CSSProperty::isInheritedProperty(id))
- const_cast<RenderStyle*>(state.parentStyle())->setHasExplicitlyInheritedProperties();
</del><ins>+ if (isInherit && !CSSProperty::isInheritedProperty(id))
+ state.style()->setHasExplicitlyInheritedProperties();
</ins><span class="cx">
</span><span class="cx"> if (id == CSSPropertyCustom) {
</span><span class="cx"> CSSCustomPropertyValue* customProperty = &downcast<CSSCustomPropertyValue>(*valueToApply);
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleChangecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleChange.cpp (201158 => 201159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleChange.cpp 2016-05-19 12:03:16 UTC (rev 201158)
+++ trunk/Source/WebCore/style/StyleChange.cpp 2016-05-19 13:22:18 UTC (rev 201159)
</span><span class="lines">@@ -63,8 +63,6 @@
</span><span class="cx"> if (s1 != s2) {
</span><span class="cx"> if (s1.inheritedNotEqual(&s2))
</span><span class="cx"> return Inherit;
</span><del>- if (s1.hasExplicitlyInheritedProperties() || s2.hasExplicitlyInheritedProperties())
- return Inherit;
</del><span class="cx">
</span><span class="cx"> return NoInherit;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleTreeResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleTreeResolver.cpp (201158 => 201159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleTreeResolver.cpp 2016-05-19 12:03:16 UTC (rev 201158)
+++ trunk/Source/WebCore/style/StyleTreeResolver.cpp 2016-05-19 13:22:18 UTC (rev 201159)
</span><span class="lines">@@ -32,6 +32,8 @@
</span><span class="cx"> #include "ComposedTreeIterator.h"
</span><span class="cx"> #include "ElementIterator.h"
</span><span class="cx"> #include "HTMLBodyElement.h"
</span><ins>+#include "HTMLMeterElement.h"
+#include "HTMLProgressElement.h"
</ins><span class="cx"> #include "HTMLSlotElement.h"
</span><span class="cx"> #include "LoaderStrategy.h"
</span><span class="cx"> #include "MainFrame.h"
</span><span class="lines">@@ -198,13 +200,15 @@
</span><span class="cx"> if (element.styleChangeType() == SyntheticStyleChange)
</span><span class="cx"> update.isSynthetic = true;
</span><span class="cx">
</span><ins>+ auto* existingStyle = element.renderStyle();
+
</ins><span class="cx"> if (&element == m_document.documentElement()) {
</span><span class="cx"> m_documentElementStyle = RenderStyle::clonePtr(*update.style);
</span><span class="cx"> scope().styleResolver.setOverrideDocumentElementStyle(m_documentElementStyle.get());
</span><span class="cx">
</span><span class="cx"> // If "rem" units are used anywhere in the document, and if the document element's font size changes, then force font updating
</span><span class="cx"> // all the way down the tree. This is simpler than having to maintain a cache of objects (and such font size changes should be rare anyway).
</span><del>- if (m_document.authorStyleSheets().usesRemUnits() && update.change != NoChange && element.renderer() && element.renderer()->style().fontSize() != update.style->fontSize()) {
</del><ins>+ if (m_document.authorStyleSheets().usesRemUnits() && update.change != NoChange && existingStyle && existingStyle->fontSize() != update.style->fontSize()) {
</ins><span class="cx"> // Cached RenderStyles may depend on the rem units.
</span><span class="cx"> scope().styleResolver.invalidateMatchedPropertiesCache();
</span><span class="cx"> update.change = Force;
</span><span class="lines">@@ -216,6 +220,12 @@
</span><span class="cx"> if (&element == m_document.body())
</span><span class="cx"> m_document.setTextColor(update.style->visitedDependentColor(CSSPropertyColor));
</span><span class="cx">
</span><ins>+ // FIXME: These elements should not change renderer based on appearance property.
+ if (is<HTMLMeterElement>(element) || is<HTMLProgressElement>(element)) {
+ if (existingStyle && update.style->appearance() != existingStyle->appearance())
+ update.change = Detach;
+ }
+
</ins><span class="cx"> if (update.change != Detach && (parent().change == Force || element.styleChangeType() >= FullStyleChange))
</span><span class="cx"> update.change = Force;
</span><span class="cx">
</span><span class="lines">@@ -341,15 +351,43 @@
</span><span class="cx"> popParent();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool shouldResolvePseudoElement(PseudoElement* pseudoElement)
</del><ins>+static bool shouldResolvePseudoElement(const PseudoElement* pseudoElement)
</ins><span class="cx"> {
</span><span class="cx"> if (!pseudoElement)
</span><span class="cx"> return false;
</span><del>- bool needsStyleRecalc = pseudoElement->needsStyleRecalc();
- pseudoElement->clearNeedsStyleRecalc();
- return needsStyleRecalc;
</del><ins>+ return pseudoElement->needsStyleRecalc();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool shouldResolveElement(const Element& element, Style::Change parentChange)
+{
+ if (parentChange >= Inherit)
+ return true;
+ if (parentChange == NoInherit) {
+ auto* existingStyle = element.renderStyle();
+ if (existingStyle && existingStyle->hasExplicitlyInheritedProperties())
+ return true;
+ }
+ if (element.needsStyleRecalc())
+ return true;
+ if (element.hasDisplayContents())
+ return true;
+ if (shouldResolvePseudoElement(element.beforePseudoElement()))
+ return true;
+ if (shouldResolvePseudoElement(element.afterPseudoElement()))
+ return true;
+
+ return false;
+}
+
+static void clearNeedsStyleResolution(Element& element)
+{
+ element.clearNeedsStyleRecalc();
+ if (auto* before = element.beforePseudoElement())
+ before->clearNeedsStyleRecalc();
+ if (auto* after = element.afterPseudoElement())
+ after->clearNeedsStyleRecalc();
+}
+
</ins><span class="cx"> void TreeResolver::resolveComposedTree()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_parentStack.size() == 1);
</span><span class="lines">@@ -395,12 +433,10 @@
</span><span class="cx"> if (element.needsStyleRecalc() || parent.elementNeedingStyleRecalcAffectsNextSiblingElementStyle)
</span><span class="cx"> parent.elementNeedingStyleRecalcAffectsNextSiblingElementStyle = element.affectsNextSiblingElementStyle();
</span><span class="cx">
</span><del>- bool shouldResolveForPseudoElement = shouldResolvePseudoElement(element.beforePseudoElement()) || shouldResolvePseudoElement(element.afterPseudoElement());
</del><ins>+ auto* style = element.renderStyle();
+ auto change = NoChange;
</ins><span class="cx">
</span><del>- const RenderStyle* style;
- Change change;
-
- bool shouldResolve = parent.change >= Inherit || element.needsStyleRecalc() || shouldResolveForPseudoElement || affectedByPreviousSibling || element.hasDisplayContents();
</del><ins>+ bool shouldResolve = shouldResolveElement(element, parent.change) || affectedByPreviousSibling;
</ins><span class="cx"> if (shouldResolve) {
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> CheckForVisibilityChangeOnRecalcStyle checkForVisibilityChange(&element, element.renderStyle());
</span><span class="lines">@@ -428,10 +464,7 @@
</span><span class="cx"> if (elementUpdate.style)
</span><span class="cx"> m_update->addElement(element, parent.element, WTFMove(elementUpdate));
</span><span class="cx">
</span><del>- element.clearNeedsStyleRecalc();
- } else {
- style = element.renderStyle();
- change = NoChange;
</del><ins>+ clearNeedsStyleResolution(element);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!style) {
</span></span></pre>
</div>
</div>
</body>
</html>