<!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>[202227] 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/202227">202227</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-06-20 01:52:10 -0700 (Mon, 20 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Updating class name of a shadow host does not update the style applied by :host()
https://bugs.webkit.org/show_bug.cgi?id=158900
<rdar://problem/26883707>
Reviewed by Simon Fraser.
Source/WebCore:
Test: fast/shadow-dom/shadow-host-style-update.html
Teach style invalidation optimization code about :host.
* style/AttributeChangeInvalidation.cpp:
(WebCore::Style::mayBeAffectedByHostStyle):
(WebCore::Style::AttributeChangeInvalidation::invalidateStyle):
* style/ClassChangeInvalidation.cpp:
(WebCore::Style::computeClassChange):
(WebCore::Style::mayBeAffectedByHostStyle):
(WebCore::Style::ClassChangeInvalidation::invalidateStyle):
* style/IdChangeInvalidation.cpp:
(WebCore::Style::mayBeAffectedByHostStyle):
(WebCore::Style::IdChangeInvalidation::invalidateStyle):
LayoutTests:
* fast/shadow-dom/shadow-host-style-update-expected.html: Added.
* fast/shadow-dom/shadow-host-style-update.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorestyleAttributeChangeInvalidationcpp">trunk/Source/WebCore/style/AttributeChangeInvalidation.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleClassChangeInvalidationcpp">trunk/Source/WebCore/style/ClassChangeInvalidation.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleIdChangeInvalidationcpp">trunk/Source/WebCore/style/IdChangeInvalidation.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastshadowdomshadowhoststyleupdateexpectedhtml">trunk/LayoutTests/fast/shadow-dom/shadow-host-style-update-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshadowdomshadowhoststyleupdatehtml">trunk/LayoutTests/fast/shadow-dom/shadow-host-style-update.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202226 => 202227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-20 07:07:04 UTC (rev 202226)
+++ trunk/LayoutTests/ChangeLog 2016-06-20 08:52:10 UTC (rev 202227)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-06-19 Antti Koivisto <antti@apple.com>
+
+ Updating class name of a shadow host does not update the style applied by :host()
+ https://bugs.webkit.org/show_bug.cgi?id=158900
+ <rdar://problem/26883707>
+
+ Reviewed by Simon Fraser.
+
+ * fast/shadow-dom/shadow-host-style-update-expected.html: Added.
+ * fast/shadow-dom/shadow-host-style-update.html: Added.
+
</ins><span class="cx"> 2016-06-19 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Test expectation gardening.
</span></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomshadowhoststyleupdateexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/shadow-host-style-update-expected.html (0 => 202227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/shadow-host-style-update-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/shadow-host-style-update-expected.html 2016-06-20 08:52:10 UTC (rev 202227)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+ <p>Test passes if you see a single 100px by 100px green box below.</p>
+ <div style="width: 100px; height: 100px; background: green;"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomshadowhoststyleupdatehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/shadow-host-style-update.html (0 => 202227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/shadow-host-style-update.html (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/shadow-host-style-update.html 2016-06-20 08:52:10 UTC (rev 202227)
</span><span class="lines">@@ -0,0 +1,70 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+.test {
+ width: 100px;
+ height: 25px;
+ background: red;
+}
+</style>
+</head>
+<body>
+<p>Test passes if you see a single 100px by 100px green box below.</p>
+<div id="host1" class="test"></div>
+<div id="host2" class="test"></div>
+<div id="host3" class="test"></div>
+<div id="host4" class="test" attr="red"></div>
+<script>
+
+var host1 = document.getElementById('host1');
+host1.attachShadow({mode: 'closed'}).innerHTML = `
+ <style>
+ :host(.green) {
+ background: green !important;
+ }
+ </style>
+`;
+
+getComputedStyle(host1).backgroundColor;
+host1.classList.toggle('green');
+
+var host2 = document.getElementById('host2');
+host2.attachShadow({mode: 'closed'}).innerHTML = `
+ <style>
+ :host(#greenID) {
+ background: green !important;
+ }
+ </style>
+`;
+
+getComputedStyle(host2).backgroundColor;
+host2.id = 'greenID';
+
+var host3 = document.getElementById('host3');
+host3.attachShadow({mode: 'closed'}).innerHTML = `
+ <style>
+ :host([greenAttr]) {
+ background: green !important;
+ }
+ </style>
+`;
+
+getComputedStyle(host3).backgroundColor;
+host3.setAttribute('greenAttr', '');
+
+var host4 = document.getElementById('host4');
+host4.attachShadow({mode: 'closed'}).innerHTML = `
+ <style>
+ :host([attr=green]) {
+ background: green !important;
+ }
+ </style>
+`;
+
+getComputedStyle(host4).backgroundColor;
+host4.setAttribute('attr', 'green');
+
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202226 => 202227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-20 07:07:04 UTC (rev 202226)
+++ trunk/Source/WebCore/ChangeLog 2016-06-20 08:52:10 UTC (rev 202227)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-06-19 Antti Koivisto <antti@apple.com>
+
+ Updating class name of a shadow host does not update the style applied by :host()
+ https://bugs.webkit.org/show_bug.cgi?id=158900
+ <rdar://problem/26883707>
+
+ Reviewed by Simon Fraser.
+
+ Test: fast/shadow-dom/shadow-host-style-update.html
+
+ Teach style invalidation optimization code about :host.
+
+ * style/AttributeChangeInvalidation.cpp:
+ (WebCore::Style::mayBeAffectedByHostStyle):
+ (WebCore::Style::AttributeChangeInvalidation::invalidateStyle):
+ * style/ClassChangeInvalidation.cpp:
+ (WebCore::Style::computeClassChange):
+ (WebCore::Style::mayBeAffectedByHostStyle):
+ (WebCore::Style::ClassChangeInvalidation::invalidateStyle):
+ * style/IdChangeInvalidation.cpp:
+ (WebCore::Style::mayBeAffectedByHostStyle):
+ (WebCore::Style::IdChangeInvalidation::invalidateStyle):
+
</ins><span class="cx"> 2016-06-19 Gavin & Ellie Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove hasStaticPropertyTable (part 5: done!)
</span></span></pre></div>
<a id="trunkSourceWebCorestyleAttributeChangeInvalidationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/AttributeChangeInvalidation.cpp (202226 => 202227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/AttributeChangeInvalidation.cpp 2016-06-20 07:07:04 UTC (rev 202226)
+++ trunk/Source/WebCore/style/AttributeChangeInvalidation.cpp 2016-06-20 08:52:10 UTC (rev 202227)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "DocumentRuleSets.h"
</span><span class="cx"> #include "ElementIterator.h"
</span><ins>+#include "ShadowRoot.h"
</ins><span class="cx"> #include "StyleInvalidationAnalysis.h"
</span><span class="cx"> #include "StyleResolver.h"
</span><span class="cx">
</span><span class="lines">@@ -34,6 +35,16 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> namespace Style {
</span><span class="cx">
</span><ins>+static bool mayBeAffectedByHostStyle(ShadowRoot& shadowRoot, bool isHTML, const QualifiedName& attributeName)
+{
+ auto& shadowRuleSets = shadowRoot.styleResolver().ruleSets();
+ if (shadowRuleSets.authorStyle()->hostPseudoClassRules().isEmpty())
+ return false;
+
+ auto& nameSet = isHTML ? shadowRuleSets.features().attributeCanonicalLocalNamesInRules : shadowRuleSets.features().attributeLocalNamesInRules;
+ return nameSet.contains(attributeName.localName().impl());
+}
+
</ins><span class="cx"> void AttributeChangeInvalidation::invalidateStyle(const QualifiedName& attributeName, const AtomicString& oldValue, const AtomicString& newValue)
</span><span class="cx"> {
</span><span class="cx"> if (newValue == oldValue)
</span><span class="lines">@@ -43,8 +54,13 @@
</span><span class="cx"> bool isHTML = m_element.isHTMLElement();
</span><span class="cx">
</span><span class="cx"> auto& nameSet = isHTML ? ruleSets.features().attributeCanonicalLocalNamesInRules : ruleSets.features().attributeLocalNamesInRules;
</span><del>- bool shouldInvalidate = nameSet.contains(attributeName.localName().impl());
- if (!shouldInvalidate)
</del><ins>+ bool mayAffectStyle = nameSet.contains(attributeName.localName().impl());
+
+ auto* shadowRoot = m_element.shadowRoot();
+ if (!mayAffectStyle && shadowRoot && mayBeAffectedByHostStyle(*shadowRoot, isHTML, attributeName))
+ mayAffectStyle = true;
+
+ if (!mayAffectStyle)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!isHTML) {
</span></span></pre></div>
<a id="trunkSourceWebCorestyleClassChangeInvalidationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/ClassChangeInvalidation.cpp (202226 => 202227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/ClassChangeInvalidation.cpp 2016-06-20 07:07:04 UTC (rev 202226)
+++ trunk/Source/WebCore/style/ClassChangeInvalidation.cpp 2016-06-20 08:52:10 UTC (rev 202227)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "DocumentRuleSets.h"
</span><span class="cx"> #include "ElementChildIterator.h"
</span><ins>+#include "ShadowRoot.h"
</ins><span class="cx"> #include "SpaceSplitString.h"
</span><span class="cx"> #include "StyleInvalidationAnalysis.h"
</span><span class="cx"> #include "StyleResolver.h"
</span><span class="lines">@@ -84,15 +85,29 @@
</span><span class="cx"> return changedClasses;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool mayBeAffectedByHostStyle(ShadowRoot& shadowRoot, AtomicStringImpl* changedClass)
+{
+ auto& shadowRuleSets = shadowRoot.styleResolver().ruleSets();
+ if (shadowRuleSets.authorStyle()->hostPseudoClassRules().isEmpty())
+ return false;
+ return shadowRuleSets.features().classesInRules.contains(changedClass);
+}
+
</ins><span class="cx"> void ClassChangeInvalidation::invalidateStyle(const SpaceSplitString& oldClasses, const SpaceSplitString& newClasses)
</span><span class="cx"> {
</span><span class="cx"> auto changedClasses = computeClassChange(oldClasses, newClasses);
</span><span class="cx">
</span><span class="cx"> auto& ruleSets = m_element.styleResolver().ruleSets();
</span><ins>+ auto* shadowRoot = m_element.shadowRoot();
</ins><span class="cx">
</span><span class="cx"> ClassChangeVector changedClassesAffectingStyle;
</span><span class="cx"> for (auto* changedClass : changedClasses) {
</span><del>- if (ruleSets.features().classesInRules.contains(changedClass))
</del><ins>+ bool mayAffectStyle = ruleSets.features().classesInRules.contains(changedClass);
+
+ if (!mayAffectStyle && shadowRoot && mayBeAffectedByHostStyle(*shadowRoot, changedClass))
+ mayAffectStyle = true;
+
+ if (mayAffectStyle)
</ins><span class="cx"> changedClassesAffectingStyle.append(changedClass);
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -99,7 +114,7 @@
</span><span class="cx"> if (changedClassesAffectingStyle.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_element.shadowRoot() && ruleSets.authorStyle()->hasShadowPseudoElementRules()) {
</del><ins>+ if (shadowRoot && ruleSets.authorStyle()->hasShadowPseudoElementRules()) {
</ins><span class="cx"> m_element.setNeedsStyleRecalc(FullStyleChange);
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorestyleIdChangeInvalidationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/IdChangeInvalidation.cpp (202226 => 202227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/IdChangeInvalidation.cpp 2016-06-20 07:07:04 UTC (rev 202226)
+++ trunk/Source/WebCore/style/IdChangeInvalidation.cpp 2016-06-20 08:52:10 UTC (rev 202227)
</span><span class="lines">@@ -28,11 +28,21 @@
</span><span class="cx">
</span><span class="cx"> #include "DocumentRuleSets.h"
</span><span class="cx"> #include "ElementChildIterator.h"
</span><ins>+#include "ShadowRoot.h"
</ins><span class="cx"> #include "StyleResolver.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> namespace Style {
</span><span class="cx">
</span><ins>+static bool mayBeAffectedByHostStyle(ShadowRoot& shadowRoot, const AtomicString& changedId)
+{
+ auto& shadowRuleSets = shadowRoot.styleResolver().ruleSets();
+ if (shadowRuleSets.authorStyle()->hostPseudoClassRules().isEmpty())
+ return false;
+
+ return shadowRuleSets.features().idsInRules.contains(changedId.impl());
+}
+
</ins><span class="cx"> void IdChangeInvalidation::invalidateStyle(const AtomicString& changedId)
</span><span class="cx"> {
</span><span class="cx"> if (changedId.isEmpty())
</span><span class="lines">@@ -41,6 +51,11 @@
</span><span class="cx"> auto& ruleSets = m_element.styleResolver().ruleSets();
</span><span class="cx">
</span><span class="cx"> bool mayAffectStyle = ruleSets.features().idsInRules.contains(changedId.impl());
</span><ins>+
+ auto* shadowRoot = m_element.shadowRoot();
+ if (!mayAffectStyle && shadowRoot && mayBeAffectedByHostStyle(*shadowRoot, changedId))
+ mayAffectStyle = true;
+
</ins><span class="cx"> if (!mayAffectStyle)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>