Sibling invalidation sets

LayoutTests/fast/css/invalidation/invalidation-set-not.html

Index: LayoutTests/fast/css/invalidation/invalidation-set-not.html
diff --git a/LayoutTests/fast/css/invalidation/invalidation-set-not.html b/LayoutTests/fast/css/invalidation/invalidation-set-not.html
index b03dcd0105825b7764df1b13c19b839415c8d1f5..341a2e3cd3534e41930398dfa30cb5a6493a0fb6 100644
--- a/LayoutTests/fast/css/invalidation/invalidation-set-not.html
+++ b/LayoutTests/fast/css/invalidation/invalidation-set-not.html
@@ -7,7 +7,9 @@
 #p3 :not(.t3) :not(.nomatch),
 #p4 .t4 :not(.nomatch),
 #p5 :-webkit-any(:not(.t5), #dummy) #r5,
-#p6 .t6 #r6:not(.dummy) { background-color: rgb(0, 128, 0); }
+#p6 .t6 #r6:not(.dummy),
+#p7 + :not(.t7) + :not(.nomatch) #r7,
+#p8 + .t8 ~ div :not(.nomatch) { background-color: rgb(0, 128, 0); }
 </style>
 <div id="p1">
     <div id="t1" class="t1">
@@ -45,6 +47,26 @@
         <div id="r6"></div>
     </div>
 </div>
+<div>
+    <div id="p7"></div>
+    <div id="t7" class="t7"></div>
+    <div>
+        <div></div>
+        <div id="r7"></div>
+    </div>
+</div>
+<div>
+    <div id="p8"></div>
+    <div id="t8"></div>
+    <div>
+        <div></div>
+        <div id="r8"></div>
+    </div>
+    <fieldset>
+        <div></div>
+    </fieldset>
+</div>
+
 <script>
 document.body.offsetTop;
 
@@ -62,7 +84,7 @@ test(function() {
     assert_equals(getComputedStyle(r2).backgroundColor, "rgba(0, 0, 0, 0)", "Background color should initially be transparent");
 
     t2.className = "";
-    assert_equals(internals.updateStyleAndReturnAffectedElementCount(), 2, "Recalc changed element and #r2");
+    assert_equals(internals.updateStyleAndReturnAffectedElementCount(), 1, "Recalc changed element and #r2");
     assert_equals(getComputedStyle(r2).backgroundColor, "rgb(0, 128, 0)", "Background color is green after class change");
 }, "Id descendant of negated class");
 
@@ -89,7 +111,7 @@ test(function() {
     assert_equals(getComputedStyle(r5).backgroundColor, "rgba(0, 0, 0, 0)", "Background color should initially be transparent");
 
     t5.className = "";
-    assert_equals(internals.updateStyleAndReturnAffectedElementCount(), 2, "Recalc changed element and #r5");
+    assert_equals(internals.updateStyleAndReturnAffectedElementCount(), 1, "Recalc changed element and #r5");
     assert_equals(getComputedStyle(r5).backgroundColor, "rgb(0, 128, 0)", "Background color is green after class change");
 }, "Id descendant of negated class in :-webkit-any");
 
@@ -98,7 +120,26 @@ test(function() {
     assert_equals(getComputedStyle(r6).backgroundColor, "rgba(0, 0, 0, 0)", "Background color should initially be transparent");
 
     t6.className = "t6";
-    assert_equals(internals.updateStyleAndReturnAffectedElementCount(), 2, "Recalc changed element and #r6");
+    assert_equals(internals.updateStyleAndReturnAffectedElementCount(), 1, "Recalc changed element and #r6");
     assert_equals(getComputedStyle(r6).backgroundColor, "rgb(0, 128, 0)", "Background color is green after class change");
 }, "Negated class with id descendant of class");
+
+test(function() {
+    assert_true(!!window.internals, "This test only works with internals exposed present");
+    assert_equals(getComputedStyle(r7).backgroundColor, "rgba(0, 0, 0, 0)", "Background color should initially be transparent");
+
+    t7.className = "";
+    assert_equals(internals.updateStyleAndReturnAffectedElementCount(), 1, "Recalc changed element and #r7");
+    assert_equals(getComputedStyle(r7).backgroundColor, "rgb(0, 128, 0)", "Background color is green after class change");
+}, "Id descendant of negated sibling class");
+
+test(function() {
+    assert_true(!!window.internals, "This test only works with internals exposed present");
+    assert_equals(getComputedStyle(r8).backgroundColor, "rgba(0, 0, 0, 0)", "Background color should initially be transparent");
+
+    t8.className = "t8";
+    assert_equals(internals.updateStyleAndReturnAffectedElementCount(), 3, "Subtree style recalc");
+    assert_equals(getComputedStyle(r8).backgroundColor, "rgb(0, 128, 0)", "Background color is green after class change");
+}, "Negated class descendant of sibling class");
+
 </script>