<!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>[189836] 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/189836">189836</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-15 18:31:50 -0700 (Tue, 15 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Style invalidation affecting siblings does not work with inline-style changes
https://bugs.webkit.org/show_bug.cgi?id=149189
Patch by Benjamin Poulain <bpoulain@apple.com> on 2015-09-15
Reviewed by Antti Koivisto.
Source/WebCore:
Style::resolveTree() made the assumption that inline style changes only affect
descendants and should not participate in "StyleRecalcAffectsNextSiblingElementStyle".
That was wrong. If the inline style change through CSSOM, it can cause the creation
of a style attribute, which is observable through "StyleRecalcAffectsNextSiblingElementStyle".
This patch removes the incorrect assumption. Style invalidation is always propagated now.
Tests: fast/css/style-attribute-invalidation-propagates-to-counted-siblings.html
fast/css/style-attribute-invalidation-propagates-to-direct-siblings.html
fast/css/style-attribute-invalidation-propagates-to-indirect-siblings.html
* css/PropertySetCSSStyleDeclaration.cpp:
(WebCore::InlineCSSStyleDeclaration::didMutate): Deleted.
* dom/StyledElement.cpp:
(WebCore::StyledElement::inlineStyleChanged):
* dom/StyledElement.h:
(WebCore::StyledElement::invalidateStyleAttribute):
Clean up inline-style invalidation a tiny bit.
* style/StyleResolveTree.cpp:
(WebCore::Style::resolveTree):
Fix the bug.
LayoutTests:
* fast/css/style-attribute-invalidation-propagates-to-counted-siblings-expected.txt: Added.
* fast/css/style-attribute-invalidation-propagates-to-counted-siblings.html: Added.
* fast/css/style-attribute-invalidation-propagates-to-direct-siblings-expected.txt: Added.
* fast/css/style-attribute-invalidation-propagates-to-direct-siblings.html: Added.
* fast/css/style-attribute-invalidation-propagates-to-indirect-siblings-expected.txt: Added.
* fast/css/style-attribute-invalidation-propagates-to-indirect-siblings.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="#trunkSourceWebCorecssPropertySetCSSStyleDeclarationcpp">trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCoredomStyledElementcpp">trunk/Source/WebCore/dom/StyledElement.cpp</a></li>
<li><a href="#trunkSourceWebCoredomStyledElementh">trunk/Source/WebCore/dom/StyledElement.h</a></li>
<li><a href="#trunkSourceWebCorestyleStyleResolveTreecpp">trunk/Source/WebCore/style/StyleResolveTree.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssstyleattributeinvalidationpropagatestocountedsiblingsexpectedtxt">trunk/LayoutTests/fast/css/style-attribute-invalidation-propagates-to-counted-siblings-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssstyleattributeinvalidationpropagatestocountedsiblingshtml">trunk/LayoutTests/fast/css/style-attribute-invalidation-propagates-to-counted-siblings.html</a></li>
<li><a href="#trunkLayoutTestsfastcssstyleattributeinvalidationpropagatestodirectsiblingsexpectedtxt">trunk/LayoutTests/fast/css/style-attribute-invalidation-propagates-to-direct-siblings-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssstyleattributeinvalidationpropagatestodirectsiblingshtml">trunk/LayoutTests/fast/css/style-attribute-invalidation-propagates-to-direct-siblings.html</a></li>
<li><a href="#trunkLayoutTestsfastcssstyleattributeinvalidationpropagatestoindirectsiblingsexpectedtxt">trunk/LayoutTests/fast/css/style-attribute-invalidation-propagates-to-indirect-siblings-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssstyleattributeinvalidationpropagatestoindirectsiblingshtml">trunk/LayoutTests/fast/css/style-attribute-invalidation-propagates-to-indirect-siblings.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (189835 => 189836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-09-16 01:14:29 UTC (rev 189835)
+++ trunk/LayoutTests/ChangeLog 2015-09-16 01:31:50 UTC (rev 189836)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-09-15 Benjamin Poulain <bpoulain@apple.com>
+
+ Style invalidation affecting siblings does not work with inline-style changes
+ https://bugs.webkit.org/show_bug.cgi?id=149189
+
+ Reviewed by Antti Koivisto.
+
+ * fast/css/style-attribute-invalidation-propagates-to-counted-siblings-expected.txt: Added.
+ * fast/css/style-attribute-invalidation-propagates-to-counted-siblings.html: Added.
+ * fast/css/style-attribute-invalidation-propagates-to-direct-siblings-expected.txt: Added.
+ * fast/css/style-attribute-invalidation-propagates-to-direct-siblings.html: Added.
+ * fast/css/style-attribute-invalidation-propagates-to-indirect-siblings-expected.txt: Added.
+ * fast/css/style-attribute-invalidation-propagates-to-indirect-siblings.html: Added.
+
</ins><span class="cx"> 2015-09-15 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Nested isolates can cause an infinite loop when laying out bidi runs
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssstyleattributeinvalidationpropagatestocountedsiblingsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/style-attribute-invalidation-propagates-to-counted-siblings-expected.txt (0 => 189836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/style-attribute-invalidation-propagates-to-counted-siblings-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/style-attribute-invalidation-propagates-to-counted-siblings-expected.txt 2015-09-16 01:31:50 UTC (rev 189836)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+Test that style invalidation through inline-style propagates correctly to siblings when a combinator requires it.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS getComputedStyle(document.querySelectorAll("target")[0]).color is "rgb(0, 0, 0)"
+PASS getComputedStyle(document.querySelectorAll("target")[1]).color is "rgb(0, 0, 0)"
+PASS getComputedStyle(document.querySelectorAll("target")[0]).color is "rgb(255, 192, 203)"
+PASS getComputedStyle(document.querySelectorAll("target")[1]).color is "rgb(255, 192, 203)"
+PASS getComputedStyle(document.querySelectorAll("target")[0]).color is "rgb(0, 0, 0)"
+PASS getComputedStyle(document.querySelectorAll("target")[1]).color is "rgb(0, 0, 0)"
+PASS getComputedStyle(document.querySelectorAll("target")[0]).color is "rgb(255, 192, 203)"
+PASS getComputedStyle(document.querySelectorAll("target")[1]).color is "rgb(255, 192, 203)"
+PASS getComputedStyle(document.querySelectorAll("target")[0]).color is "rgb(255, 192, 203)"
+PASS getComputedStyle(document.querySelectorAll("target")[1]).color is "rgb(255, 192, 203)"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssstyleattributeinvalidationpropagatestocountedsiblingshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/style-attribute-invalidation-propagates-to-counted-siblings.html (0 => 189836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/style-attribute-invalidation-propagates-to-counted-siblings.html (rev 0)
+++ trunk/LayoutTests/fast/css/style-attribute-invalidation-propagates-to-counted-siblings.html 2015-09-16 01:31:50 UTC (rev 189836)
</span><span class="lines">@@ -0,0 +1,91 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<style>
+target {
+ color: black;
+}
+target:nth-child(2 of target, trigger[style]) {
+ color: pink;
+}
+</style>
+</head>
+<body>
+ <div>
+ <!-- With renderer -->
+ <trigger></trigger>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <target></target>
+ </div>
+ <div style="display:none;">
+ <!-- Without renderer -->
+ <trigger></trigger>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <target></target>
+ </div>
+</body>
+<script>
+
+description('Test that style invalidation through inline-style propagates correctly to siblings when a combinator requires it.');
+
+function testTargetColor(expectedColor) {
+ let allTargets = document.querySelectorAll("target");
+ for (let i = 0; i < allTargets.length; ++i) {
+ shouldBeEqualToString('getComputedStyle(document.querySelectorAll("target")[' + i + ']).color', expectedColor);
+ }
+}
+
+testTargetColor('rgb(0, 0, 0)');
+
+// Set a style through CSS OM.
+function setPropertyWithCSSOM() {
+ let allTriggers = document.querySelectorAll("trigger");
+ for (let i = 0; i < allTriggers.length; ++i) {
+ allTriggers[i].style.cursor = "auto";
+ }
+}
+setPropertyWithCSSOM()
+testTargetColor('rgb(255, 192, 203)');
+
+// If we remove the attribute, we should be back to normal.
+function removeStyleAttribute() {
+ let allTriggers = document.querySelectorAll("trigger");
+ for (let i = 0; i < allTriggers.length; ++i) {
+ allTriggers[i].removeAttribute("style");
+ }
+}
+removeStyleAttribute();
+testTargetColor('rgb(0, 0, 0)');
+
+// Setting the style through a style attribute directly.
+function setStyleAttribute() {
+ let allTriggers = document.querySelectorAll("trigger");
+ for (let i = 0; i < allTriggers.length; ++i) {
+ allTriggers[i].setAttribute("style", "alt: \"WebKit!\"");
+ }
+}
+setStyleAttribute();
+testTargetColor('rgb(255, 192, 203)');
+
+// Removing the property on the style attribute through CSSOM.
+// This leaves an empty style attribute.
+function removePropertyWithCSSOM() {
+ let allTriggers = document.querySelectorAll("trigger");
+ for (let i = 0; i < allTriggers.length; ++i) {
+ allTriggers[i].style.removeProperty("alt");
+ }
+}
+removePropertyWithCSSOM()
+testTargetColor('rgb(255, 192, 203)');
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssstyleattributeinvalidationpropagatestodirectsiblingsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/style-attribute-invalidation-propagates-to-direct-siblings-expected.txt (0 => 189836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/style-attribute-invalidation-propagates-to-direct-siblings-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/style-attribute-invalidation-propagates-to-direct-siblings-expected.txt 2015-09-16 01:31:50 UTC (rev 189836)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+Test that style invalidation through inline-style propagates correctly to siblings when a combinator requires it.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS getComputedStyle(document.querySelectorAll("target")[0]).color is "rgb(0, 0, 0)"
+PASS getComputedStyle(document.querySelectorAll("target")[1]).color is "rgb(0, 0, 0)"
+PASS getComputedStyle(document.querySelectorAll("target")[0]).color is "rgb(255, 192, 203)"
+PASS getComputedStyle(document.querySelectorAll("target")[1]).color is "rgb(255, 192, 203)"
+PASS getComputedStyle(document.querySelectorAll("target")[0]).color is "rgb(0, 0, 0)"
+PASS getComputedStyle(document.querySelectorAll("target")[1]).color is "rgb(0, 0, 0)"
+PASS getComputedStyle(document.querySelectorAll("target")[0]).color is "rgb(255, 192, 203)"
+PASS getComputedStyle(document.querySelectorAll("target")[1]).color is "rgb(255, 192, 203)"
+PASS getComputedStyle(document.querySelectorAll("target")[0]).color is "rgb(255, 192, 203)"
+PASS getComputedStyle(document.querySelectorAll("target")[1]).color is "rgb(255, 192, 203)"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssstyleattributeinvalidationpropagatestodirectsiblingshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/style-attribute-invalidation-propagates-to-direct-siblings.html (0 => 189836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/style-attribute-invalidation-propagates-to-direct-siblings.html (rev 0)
+++ trunk/LayoutTests/fast/css/style-attribute-invalidation-propagates-to-direct-siblings.html 2015-09-16 01:31:50 UTC (rev 189836)
</span><span class="lines">@@ -0,0 +1,81 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<style>
+target {
+ color: black;
+}
+trigger[style] + target {
+ color: pink;
+}
+</style>
+</head>
+<body>
+ <div>
+ <!-- With renderer -->
+ <trigger></trigger>
+ <target></target>
+ </div>
+ <div style="display:none;">
+ <!-- Without renderer -->
+ <trigger></trigger>
+ <target></target>
+ </div>
+</body>
+<script>
+
+description('Test that style invalidation through inline-style propagates correctly to siblings when a combinator requires it.');
+
+function testTargetColor(expectedColor) {
+ let allTargets = document.querySelectorAll("target");
+ for (let i = 0; i < allTargets.length; ++i) {
+ shouldBeEqualToString('getComputedStyle(document.querySelectorAll("target")[' + i + ']).color', expectedColor);
+ }
+}
+
+testTargetColor('rgb(0, 0, 0)');
+
+// Set a style through CSS OM.
+function setPropertyWithCSSOM() {
+ let allTriggers = document.querySelectorAll("trigger");
+ for (let i = 0; i < allTriggers.length; ++i) {
+ allTriggers[i].style.cursor = "auto";
+ }
+}
+setPropertyWithCSSOM()
+testTargetColor('rgb(255, 192, 203)');
+
+// If we remove the attribute, we should be back to normal.
+function removeStyleAttribute() {
+ let allTriggers = document.querySelectorAll("trigger");
+ for (let i = 0; i < allTriggers.length; ++i) {
+ allTriggers[i].removeAttribute("style");
+ }
+}
+removeStyleAttribute();
+testTargetColor('rgb(0, 0, 0)');
+
+// Setting the style through a style attribute directly.
+function setStyleAttribute() {
+ let allTriggers = document.querySelectorAll("trigger");
+ for (let i = 0; i < allTriggers.length; ++i) {
+ allTriggers[i].setAttribute("style", "alt: \"WebKit!\"");
+ }
+}
+setStyleAttribute();
+testTargetColor('rgb(255, 192, 203)');
+
+// Removing the property on the style attribute through CSSOM.
+// This leaves an empty style attribute.
+function removePropertyWithCSSOM() {
+ let allTriggers = document.querySelectorAll("trigger");
+ for (let i = 0; i < allTriggers.length; ++i) {
+ allTriggers[i].style.removeProperty("alt");
+ }
+}
+removePropertyWithCSSOM()
+testTargetColor('rgb(255, 192, 203)');
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssstyleattributeinvalidationpropagatestoindirectsiblingsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/style-attribute-invalidation-propagates-to-indirect-siblings-expected.txt (0 => 189836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/style-attribute-invalidation-propagates-to-indirect-siblings-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/style-attribute-invalidation-propagates-to-indirect-siblings-expected.txt 2015-09-16 01:31:50 UTC (rev 189836)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+Test that style invalidation through inline-style propagates correctly to siblings when a combinator requires it.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS getComputedStyle(document.querySelectorAll("target")[0]).color is "rgb(0, 0, 0)"
+PASS getComputedStyle(document.querySelectorAll("target")[1]).color is "rgb(0, 0, 0)"
+PASS getComputedStyle(document.querySelectorAll("target")[0]).color is "rgb(255, 192, 203)"
+PASS getComputedStyle(document.querySelectorAll("target")[1]).color is "rgb(255, 192, 203)"
+PASS getComputedStyle(document.querySelectorAll("target")[0]).color is "rgb(0, 0, 0)"
+PASS getComputedStyle(document.querySelectorAll("target")[1]).color is "rgb(0, 0, 0)"
+PASS getComputedStyle(document.querySelectorAll("target")[0]).color is "rgb(255, 192, 203)"
+PASS getComputedStyle(document.querySelectorAll("target")[1]).color is "rgb(255, 192, 203)"
+PASS getComputedStyle(document.querySelectorAll("target")[0]).color is "rgb(255, 192, 203)"
+PASS getComputedStyle(document.querySelectorAll("target")[1]).color is "rgb(255, 192, 203)"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssstyleattributeinvalidationpropagatestoindirectsiblingshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/style-attribute-invalidation-propagates-to-indirect-siblings.html (0 => 189836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/style-attribute-invalidation-propagates-to-indirect-siblings.html (rev 0)
+++ trunk/LayoutTests/fast/css/style-attribute-invalidation-propagates-to-indirect-siblings.html 2015-09-16 01:31:50 UTC (rev 189836)
</span><span class="lines">@@ -0,0 +1,91 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<style>
+target {
+ color: black;
+}
+trigger[style] ~ target {
+ color: pink;
+}
+</style>
+</head>
+<body>
+ <div>
+ <!-- With renderer -->
+ <trigger></trigger>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <target></target>
+ </div>
+ <div style="display:none;">
+ <!-- Without renderer -->
+ <trigger></trigger>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <target></target>
+ </div>
+</body>
+<script>
+
+description('Test that style invalidation through inline-style propagates correctly to siblings when a combinator requires it.');
+
+function testTargetColor(expectedColor) {
+ let allTargets = document.querySelectorAll("target");
+ for (let i = 0; i < allTargets.length; ++i) {
+ shouldBeEqualToString('getComputedStyle(document.querySelectorAll("target")[' + i + ']).color', expectedColor);
+ }
+}
+
+testTargetColor('rgb(0, 0, 0)');
+
+// Set a style through CSS OM.
+function setPropertyWithCSSOM() {
+ let allTriggers = document.querySelectorAll("trigger");
+ for (let i = 0; i < allTriggers.length; ++i) {
+ allTriggers[i].style.cursor = "auto";
+ }
+}
+setPropertyWithCSSOM()
+testTargetColor('rgb(255, 192, 203)');
+
+// If we remove the attribute, we should be back to normal.
+function removeStyleAttribute() {
+ let allTriggers = document.querySelectorAll("trigger");
+ for (let i = 0; i < allTriggers.length; ++i) {
+ allTriggers[i].removeAttribute("style");
+ }
+}
+removeStyleAttribute();
+testTargetColor('rgb(0, 0, 0)');
+
+// Setting the style through a style attribute directly.
+function setStyleAttribute() {
+ let allTriggers = document.querySelectorAll("trigger");
+ for (let i = 0; i < allTriggers.length; ++i) {
+ allTriggers[i].setAttribute("style", "alt: \"WebKit!\"");
+ }
+}
+setStyleAttribute();
+testTargetColor('rgb(255, 192, 203)');
+
+// Removing the property on the style attribute through CSSOM.
+// This leaves an empty style attribute.
+function removePropertyWithCSSOM() {
+ let allTriggers = document.querySelectorAll("trigger");
+ for (let i = 0; i < allTriggers.length; ++i) {
+ allTriggers[i].style.removeProperty("alt");
+ }
+}
+removePropertyWithCSSOM()
+testTargetColor('rgb(255, 192, 203)');
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189835 => 189836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-16 01:14:29 UTC (rev 189835)
+++ trunk/Source/WebCore/ChangeLog 2015-09-16 01:31:50 UTC (rev 189836)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2015-09-15 Benjamin Poulain <bpoulain@apple.com>
+
+ Style invalidation affecting siblings does not work with inline-style changes
+ https://bugs.webkit.org/show_bug.cgi?id=149189
+
+ Reviewed by Antti Koivisto.
+
+ Style::resolveTree() made the assumption that inline style changes only affect
+ descendants and should not participate in "StyleRecalcAffectsNextSiblingElementStyle".
+ That was wrong. If the inline style change through CSSOM, it can cause the creation
+ of a style attribute, which is observable through "StyleRecalcAffectsNextSiblingElementStyle".
+
+ This patch removes the incorrect assumption. Style invalidation is always propagated now.
+
+ Tests: fast/css/style-attribute-invalidation-propagates-to-counted-siblings.html
+ fast/css/style-attribute-invalidation-propagates-to-direct-siblings.html
+ fast/css/style-attribute-invalidation-propagates-to-indirect-siblings.html
+
+ * css/PropertySetCSSStyleDeclaration.cpp:
+ (WebCore::InlineCSSStyleDeclaration::didMutate): Deleted.
+ * dom/StyledElement.cpp:
+ (WebCore::StyledElement::inlineStyleChanged):
+ * dom/StyledElement.h:
+ (WebCore::StyledElement::invalidateStyleAttribute):
+ Clean up inline-style invalidation a tiny bit.
+
+ * style/StyleResolveTree.cpp:
+ (WebCore::Style::resolveTree):
+ Fix the bug.
+
</ins><span class="cx"> 2015-09-15 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Paused Debugger prevents page reload
</span></span></pre></div>
<a id="trunkSourceWebCorecssPropertySetCSSStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp (189835 => 189836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp 2015-09-16 01:14:29 UTC (rev 189835)
+++ trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp 2015-09-16 01:31:50 UTC (rev 189836)
</span><span class="lines">@@ -365,7 +365,6 @@
</span><span class="cx"> if (!m_parentElement)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_parentElement->setNeedsStyleRecalc(InlineStyleChange);
</del><span class="cx"> m_parentElement->invalidateStyleAttribute();
</span><span class="cx"> StyleAttributeMutationScope(this).didInvalidateStyleAttr();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomStyledElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/StyledElement.cpp (189835 => 189836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/StyledElement.cpp 2015-09-16 01:14:29 UTC (rev 189835)
+++ trunk/Source/WebCore/dom/StyledElement.cpp 2015-09-16 01:31:50 UTC (rev 189836)
</span><span class="lines">@@ -214,9 +214,7 @@
</span><span class="cx">
</span><span class="cx"> void StyledElement::inlineStyleChanged()
</span><span class="cx"> {
</span><del>- setNeedsStyleRecalc(InlineStyleChange);
- ASSERT(elementData());
- elementData()->setStyleAttributeIsDirty(true);
</del><ins>+ invalidateStyleAttribute();
</ins><span class="cx"> InspectorInstrumentation::didInvalidateStyleAttr(document(), *this);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomStyledElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/StyledElement.h (189835 => 189836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/StyledElement.h 2015-09-16 01:14:29 UTC (rev 189835)
+++ trunk/Source/WebCore/dom/StyledElement.h 2015-09-16 01:31:50 UTC (rev 189836)
</span><span class="lines">@@ -97,6 +97,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(elementData());
</span><span class="cx"> elementData()->setStyleAttributeIsDirty(true);
</span><ins>+ setNeedsStyleRecalc(InlineStyleChange);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline const StyleProperties* StyledElement::presentationAttributeStyle()
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveTree.cpp (189835 => 189836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveTree.cpp 2015-09-16 01:14:29 UTC (rev 189835)
+++ trunk/Source/WebCore/style/StyleResolveTree.cpp 2015-09-16 01:31:50 UTC (rev 189836)
</span><span class="lines">@@ -820,7 +820,7 @@
</span><span class="cx"> if (childElement.styleIsAffectedByPreviousSibling())
</span><span class="cx"> childElement.setNeedsStyleRecalc();
</span><span class="cx"> elementNeedingStyleRecalcAffectsNextSiblingElementStyle = childElement.affectsNextSiblingElementStyle();
</span><del>- } else if (childElement.styleChangeType() >= FullStyleChange)
</del><ins>+ } else if (childElement.needsStyleRecalc())
</ins><span class="cx"> elementNeedingStyleRecalcAffectsNextSiblingElementStyle = childElement.affectsNextSiblingElementStyle();
</span><span class="cx"> if (change >= Inherit || childElement.childNeedsStyleRecalc() || childElement.needsStyleRecalc()) {
</span><span class="cx"> parentPusher.push();
</span></span></pre>
</div>
</div>
</body>
</html>