<!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>[189560] 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/189560">189560</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-09 16:40:55 -0700 (Wed, 09 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>CSS general sibling selectors does not work without CSS JIT
https://bugs.webkit.org/show_bug.cgi?id=148987
rdar://problem/22559860
Patch by Benjamin Poulain <bpoulain@apple.com> on 2015-09-09
Reviewed by Andreas Kling.
Source/WebCore:
When traversing with the indirect adjacent combinator, SelectorChecker
was not setting the style invalidation flag on the right element.
Tests: fast/css/indirect-adjacent-style-invalidation-1.html
fast/css/indirect-adjacent-style-invalidation-2.html
fast/css/indirect-adjacent-style-invalidation-3.html
* css/SelectorChecker.cpp:
(WebCore::SelectorChecker::matchRecursively):
LayoutTests:
There are multiple variations of the same tests to test
cases where we JIT and cases without JIT.
* fast/css/indirect-adjacent-style-invalidation-1-expected.txt: Added.
* fast/css/indirect-adjacent-style-invalidation-1.html: Added.
* fast/css/indirect-adjacent-style-invalidation-2-expected.txt: Added.
* fast/css/indirect-adjacent-style-invalidation-2.html: Added.
* fast/css/indirect-adjacent-style-invalidation-3-expected.txt: Added.
* fast/css/indirect-adjacent-style-invalidation-3.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="#trunkSourceWebCorecssSelectorCheckercpp">trunk/Source/WebCore/css/SelectorChecker.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssindirectadjacentstyleinvalidation1expectedtxt">trunk/LayoutTests/fast/css/indirect-adjacent-style-invalidation-1-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssindirectadjacentstyleinvalidation1html">trunk/LayoutTests/fast/css/indirect-adjacent-style-invalidation-1.html</a></li>
<li><a href="#trunkLayoutTestsfastcssindirectadjacentstyleinvalidation2expectedtxt">trunk/LayoutTests/fast/css/indirect-adjacent-style-invalidation-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssindirectadjacentstyleinvalidation2html">trunk/LayoutTests/fast/css/indirect-adjacent-style-invalidation-2.html</a></li>
<li><a href="#trunkLayoutTestsfastcssindirectadjacentstyleinvalidation3expectedtxt">trunk/LayoutTests/fast/css/indirect-adjacent-style-invalidation-3-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssindirectadjacentstyleinvalidation3html">trunk/LayoutTests/fast/css/indirect-adjacent-style-invalidation-3.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (189559 => 189560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-09-09 23:31:32 UTC (rev 189559)
+++ trunk/LayoutTests/ChangeLog 2015-09-09 23:40:55 UTC (rev 189560)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-09-09 Benjamin Poulain <bpoulain@apple.com>
+
+ CSS general sibling selectors does not work without CSS JIT
+ https://bugs.webkit.org/show_bug.cgi?id=148987
+ rdar://problem/22559860
+
+ Reviewed by Andreas Kling.
+
+ There are multiple variations of the same tests to test
+ cases where we JIT and cases without JIT.
+
+ * fast/css/indirect-adjacent-style-invalidation-1-expected.txt: Added.
+ * fast/css/indirect-adjacent-style-invalidation-1.html: Added.
+ * fast/css/indirect-adjacent-style-invalidation-2-expected.txt: Added.
+ * fast/css/indirect-adjacent-style-invalidation-2.html: Added.
+ * fast/css/indirect-adjacent-style-invalidation-3-expected.txt: Added.
+ * fast/css/indirect-adjacent-style-invalidation-3.html: Added.
+
</ins><span class="cx"> 2015-09-09 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: typesettingFeatures & (Kerning | Ligatures) in WebCore::applyFontTransforms
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssindirectadjacentstyleinvalidation1expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/indirect-adjacent-style-invalidation-1-expected.txt (0 => 189560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/indirect-adjacent-style-invalidation-1-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/indirect-adjacent-style-invalidation-1-expected.txt 2015-09-09 23:40:55 UTC (rev 189560)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+Test the style invalidation of elements affected by an indirect adjacent.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[0]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[1]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[0]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[1]) is false
+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 window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[0]) is true
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[1]) is true
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[0]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[1]) is false
+PASS getComputedStyle(document.querySelectorAll("target")[0]).color is "rgb(0, 1, 2)"
+PASS getComputedStyle(document.querySelectorAll("target")[1]).color is "rgb(0, 1, 2)"
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[0]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[1]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[0]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[1]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[0]) is true
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[1]) is true
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[0]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[1]) is false
+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 window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[0]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[1]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[0]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[1]) is false
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssindirectadjacentstyleinvalidation1html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/indirect-adjacent-style-invalidation-1.html (0 => 189560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/indirect-adjacent-style-invalidation-1.html (rev 0)
+++ trunk/LayoutTests/fast/css/indirect-adjacent-style-invalidation-1.html 2015-09-09 23:40:55 UTC (rev 189560)
</span><span class="lines">@@ -0,0 +1,94 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<style>
+* {
+ color: black;
+}
+:checked ~ target {
+ color: rgb(0, 1, 2);
+}
+</style>
+</head>
+<body>
+ <div>
+ <!-- With renderer -->
+ <input class="activator" type="checkbox">
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <target></target>
+ </div>
+ <div style="display:none;">
+ <!-- Without renderer -->
+ <input class="activator" type="radio">
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <target></target>
+ </div>
+</body>
+<script>
+
+description('Test the style invalidation of elements affected by an indirect adjacent.');
+
+function shouldNeedStyleRecalc(expected) {
+ var testFunction = expected ? shouldBeTrue : shouldBeFalse;
+ testFunction("window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(\".activator\")[0])");
+ testFunction("window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(\".activator\")[1])");
+ shouldBeFalse("window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(\"target\")[0])");
+ shouldBeFalse("window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(\"target\")[1])");
+}
+
+function setId(name) {
+ var allTargets = document.querySelectorAll("target");
+ allTargets[0].id = name;
+ allTargets[1].id = name;
+}
+
+function checkStyle(expectedColor) {
+ var allTargets = document.querySelectorAll("target");
+ shouldBeEqualToString('getComputedStyle(document.querySelectorAll("target")[0]).color', expectedColor);
+ shouldBeEqualToString('getComputedStyle(document.querySelectorAll("target")[1]).color', expectedColor);
+}
+// Force a layout to ensure we don't have dirty styles.
+var offsetTop = document.documentElement.offsetTop;
+
+// Initial state.
+shouldNeedStyleRecalc(false);
+checkStyle("rgb(0, 0, 0)");
+
+// Check the input fields.
+var allActivators = document.querySelectorAll("input.activator:matches([type=checkbox], [type=radio])");
+for (let i = 0; i < allActivators.length; ++i) {
+ allActivators[i].checked = true;
+}
+shouldNeedStyleRecalc(true);
+checkStyle("rgb(0, 1, 2)");
+shouldNeedStyleRecalc(false);
+
+// Uncheck the input fields.
+var allActivators = document.querySelectorAll("input.activator:matches([type=checkbox], [type=radio])");
+for (let i = 0; i < allActivators.length; ++i) {
+ allActivators[i].checked = false;
+}
+shouldNeedStyleRecalc(true);
+checkStyle("rgb(0, 0, 0)");
+shouldNeedStyleRecalc(false);
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssindirectadjacentstyleinvalidation2expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/indirect-adjacent-style-invalidation-2-expected.txt (0 => 189560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/indirect-adjacent-style-invalidation-2-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/indirect-adjacent-style-invalidation-2-expected.txt 2015-09-09 23:40:55 UTC (rev 189560)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+Test the style invalidation of elements affected by an indirect adjacent.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[0]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[1]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[0]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[1]) is false
+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 window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[0]) is true
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[1]) is true
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[0]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[1]) is false
+PASS getComputedStyle(document.querySelectorAll("target")[0]).color is "rgb(0, 1, 2)"
+PASS getComputedStyle(document.querySelectorAll("target")[1]).color is "rgb(0, 1, 2)"
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[0]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[1]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[0]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[1]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[0]) is true
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[1]) is true
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[0]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[1]) is false
+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 window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[0]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[1]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[0]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[1]) is false
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssindirectadjacentstyleinvalidation2html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/indirect-adjacent-style-invalidation-2.html (0 => 189560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/indirect-adjacent-style-invalidation-2.html (rev 0)
+++ trunk/LayoutTests/fast/css/indirect-adjacent-style-invalidation-2.html 2015-09-09 23:40:55 UTC (rev 189560)
</span><span class="lines">@@ -0,0 +1,94 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<style>
+* {
+ color: black;
+}
+:checked:first-of-type ~ target {
+ color: rgb(0, 1, 2);
+}
+</style>
+</head>
+<body>
+ <div>
+ <!-- With renderer -->
+ <input class="activator" type="checkbox">
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <target></target>
+ </div>
+ <div style="display:none;">
+ <!-- Without renderer -->
+ <input class="activator" type="radio">
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <target></target>
+ </div>
+</body>
+<script>
+
+description('Test the style invalidation of elements affected by an indirect adjacent.');
+
+function shouldNeedStyleRecalc(expected) {
+ var testFunction = expected ? shouldBeTrue : shouldBeFalse;
+ testFunction("window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(\".activator\")[0])");
+ testFunction("window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(\".activator\")[1])");
+ shouldBeFalse("window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(\"target\")[0])");
+ shouldBeFalse("window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(\"target\")[1])");
+}
+
+function setId(name) {
+ var allTargets = document.querySelectorAll("target");
+ allTargets[0].id = name;
+ allTargets[1].id = name;
+}
+
+function checkStyle(expectedColor) {
+ var allTargets = document.querySelectorAll("target");
+ shouldBeEqualToString('getComputedStyle(document.querySelectorAll("target")[0]).color', expectedColor);
+ shouldBeEqualToString('getComputedStyle(document.querySelectorAll("target")[1]).color', expectedColor);
+}
+// Force a layout to ensure we don't have dirty styles.
+var offsetTop = document.documentElement.offsetTop;
+
+// Initial state.
+shouldNeedStyleRecalc(false);
+checkStyle("rgb(0, 0, 0)");
+
+// Check the input fields.
+var allActivators = document.querySelectorAll("input.activator:matches([type=checkbox], [type=radio])");
+for (let i = 0; i < allActivators.length; ++i) {
+ allActivators[i].checked = true;
+}
+shouldNeedStyleRecalc(true);
+checkStyle("rgb(0, 1, 2)");
+shouldNeedStyleRecalc(false);
+
+// Uncheck the input fields.
+var allActivators = document.querySelectorAll("input.activator:matches([type=checkbox], [type=radio])");
+for (let i = 0; i < allActivators.length; ++i) {
+ allActivators[i].checked = false;
+}
+shouldNeedStyleRecalc(true);
+checkStyle("rgb(0, 0, 0)");
+shouldNeedStyleRecalc(false);
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssindirectadjacentstyleinvalidation3expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/indirect-adjacent-style-invalidation-3-expected.txt (0 => 189560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/indirect-adjacent-style-invalidation-3-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/indirect-adjacent-style-invalidation-3-expected.txt 2015-09-09 23:40:55 UTC (rev 189560)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+Test the style invalidation of elements affected by an indirect adjacent.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[0]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[1]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[0]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[1]) is false
+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 window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[0]) is true
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[1]) is true
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[0]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[1]) is false
+PASS getComputedStyle(document.querySelectorAll("target")[0]).color is "rgb(0, 1, 2)"
+PASS getComputedStyle(document.querySelectorAll("target")[1]).color is "rgb(0, 1, 2)"
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[0]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[1]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[0]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[1]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[0]) is true
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[1]) is true
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[0]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[1]) is false
+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 window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[0]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(".activator")[1]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[0]) is false
+PASS window.internals.nodeNeedsStyleRecalc(document.querySelectorAll("target")[1]) is false
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssindirectadjacentstyleinvalidation3html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/indirect-adjacent-style-invalidation-3.html (0 => 189560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/indirect-adjacent-style-invalidation-3.html (rev 0)
+++ trunk/LayoutTests/fast/css/indirect-adjacent-style-invalidation-3.html 2015-09-09 23:40:55 UTC (rev 189560)
</span><span class="lines">@@ -0,0 +1,94 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<style>
+* {
+ color: black;
+}
+:checked:matches(*, :last-of-type, *) ~ target {
+ color: rgb(0, 1, 2);
+}
+</style>
+</head>
+<body>
+ <div>
+ <!-- With renderer -->
+ <input class="activator" type="checkbox">
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <target></target>
+ </div>
+ <div style="display:none;">
+ <!-- Without renderer -->
+ <input class="activator" type="radio">
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <padding></padding>
+ <target></target>
+ </div>
+</body>
+<script>
+
+description('Test the style invalidation of elements affected by an indirect adjacent.');
+
+function shouldNeedStyleRecalc(expected) {
+ var testFunction = expected ? shouldBeTrue : shouldBeFalse;
+ testFunction("window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(\".activator\")[0])");
+ testFunction("window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(\".activator\")[1])");
+ shouldBeFalse("window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(\"target\")[0])");
+ shouldBeFalse("window.internals.nodeNeedsStyleRecalc(document.querySelectorAll(\"target\")[1])");
+}
+
+function setId(name) {
+ var allTargets = document.querySelectorAll("target");
+ allTargets[0].id = name;
+ allTargets[1].id = name;
+}
+
+function checkStyle(expectedColor) {
+ var allTargets = document.querySelectorAll("target");
+ shouldBeEqualToString('getComputedStyle(document.querySelectorAll("target")[0]).color', expectedColor);
+ shouldBeEqualToString('getComputedStyle(document.querySelectorAll("target")[1]).color', expectedColor);
+}
+// Force a layout to ensure we don't have dirty styles.
+var offsetTop = document.documentElement.offsetTop;
+
+// Initial state.
+shouldNeedStyleRecalc(false);
+checkStyle("rgb(0, 0, 0)");
+
+// Check the input fields.
+var allActivators = document.querySelectorAll("input.activator:matches([type=checkbox], [type=radio])");
+for (let i = 0; i < allActivators.length; ++i) {
+ allActivators[i].checked = true;
+}
+shouldNeedStyleRecalc(true);
+checkStyle("rgb(0, 1, 2)");
+shouldNeedStyleRecalc(false);
+
+// Uncheck the input fields.
+var allActivators = document.querySelectorAll("input.activator:matches([type=checkbox], [type=radio])");
+for (let i = 0; i < allActivators.length; ++i) {
+ allActivators[i].checked = false;
+}
+shouldNeedStyleRecalc(true);
+checkStyle("rgb(0, 0, 0)");
+shouldNeedStyleRecalc(false);
+
+</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 (189559 => 189560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-09 23:31:32 UTC (rev 189559)
+++ trunk/Source/WebCore/ChangeLog 2015-09-09 23:40:55 UTC (rev 189560)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-09-09 Benjamin Poulain <bpoulain@apple.com>
+
+ CSS general sibling selectors does not work without CSS JIT
+ https://bugs.webkit.org/show_bug.cgi?id=148987
+ rdar://problem/22559860
+
+ Reviewed by Andreas Kling.
+
+ When traversing with the indirect adjacent combinator, SelectorChecker
+ was not setting the style invalidation flag on the right element.
+
+ Tests: fast/css/indirect-adjacent-style-invalidation-1.html
+ fast/css/indirect-adjacent-style-invalidation-2.html
+ fast/css/indirect-adjacent-style-invalidation-3.html
+
+ * css/SelectorChecker.cpp:
+ (WebCore::SelectorChecker::matchRecursively):
+
</ins><span class="cx"> 2015-09-09 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Remove unused InspectorFrontendHost methods
</span></span></pre></div>
<a id="trunkSourceWebCorecssSelectorCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SelectorChecker.cpp (189559 => 189560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SelectorChecker.cpp 2015-09-09 23:31:32 UTC (rev 189559)
+++ trunk/Source/WebCore/css/SelectorChecker.cpp 2015-09-09 23:40:55 UTC (rev 189560)
</span><span class="lines">@@ -353,7 +353,7 @@
</span><span class="cx"> nextContext.elementStyle = nullptr;
</span><span class="cx"> for (; nextContext.element; nextContext.element = nextContext.element->previousElementSibling()) {
</span><span class="cx"> if (context.resolvingMode == Mode::ResolvingStyle)
</span><del>- context.element->setAffectsNextSiblingElementStyle();
</del><ins>+ nextContext.element->setAffectsNextSiblingElementStyle();
</ins><span class="cx">
</span><span class="cx"> PseudoIdSet ignoreDynamicPseudo;
</span><span class="cx"> unsigned indirectAdjacentSpecificity = 0;
</span></span></pre>
</div>
</div>
</body>
</html>