| Index: third_party/WebKit/LayoutTests/fast/css/invalidation/compound.html
|
| diff --git a/third_party/WebKit/LayoutTests/fast/css/invalidation/compound.html b/third_party/WebKit/LayoutTests/fast/css/invalidation/compound.html
|
| index 2039dc023d7edbf142563bf865a3dc402d45e511..1e0bdfee6582816391b017483b150243c98bf3b1 100644
|
| --- a/third_party/WebKit/LayoutTests/fast/css/invalidation/compound.html
|
| +++ b/third_party/WebKit/LayoutTests/fast/css/invalidation/compound.html
|
| @@ -130,7 +130,7 @@ test(function() {
|
| assert_equals(getComputedStyle(r1).backgroundColor, "rgba(0, 0, 0, 0)", "Background color should initially be transparent");
|
|
|
| t1.className = "t1";
|
| - assert_equals(internals.updateStyleAndReturnAffectedElementCount(), 4, "Subtree style recalc");
|
| + assert_equals(internals.updateStyleAndLayoutAndReturnAffectedElementCount(), 4, "Subtree style recalc");
|
| assert_equals(getComputedStyle(r1).backgroundColor, "rgb(0, 128, 0)", "Background color is green after class change");
|
| }, "Descendant with compound selector containing id");
|
|
|
| @@ -138,7 +138,7 @@ test(function() {
|
| assert_equals(getComputedStyle(r2).backgroundColor, "rgba(0, 0, 0, 0)", "Background color should initially be transparent");
|
|
|
| t2.className = "t2";
|
| - assert_equals(internals.updateStyleAndReturnAffectedElementCount(), 2, "Subtree style recalc");
|
| + assert_equals(internals.updateStyleAndLayoutAndReturnAffectedElementCount(), 2, "Subtree style recalc");
|
| assert_equals(getComputedStyle(r2).backgroundColor, "rgb(0, 128, 0)", "Background color is green after class change");
|
| }, "Descendant with compound selector containing universal and id");
|
|
|
| @@ -146,7 +146,7 @@ test(function() {
|
| assert_equals(getComputedStyle(r3).backgroundColor, "rgba(0, 0, 0, 0)", "Background color should initially be transparent");
|
|
|
| t3.className = "t3";
|
| - assert_equals(internals.updateStyleAndReturnAffectedElementCount(), 3, "Subtree style recalc");
|
| + assert_equals(internals.updateStyleAndLayoutAndReturnAffectedElementCount(), 3, "Subtree style recalc");
|
| assert_equals(getComputedStyle(r3).backgroundColor, "rgb(0, 128, 0)", "Background color is green after class change");
|
| }, "Descendant with compound selector");
|
|
|
| @@ -154,7 +154,7 @@ test(function() {
|
| assert_equals(getComputedStyle(r4).backgroundColor, "rgba(0, 0, 0, 0)", "Background color should initially be transparent");
|
|
|
| t4.className = "t4";
|
| - assert_equals(internals.updateStyleAndReturnAffectedElementCount(), 3, "Subtree style recalc");
|
| + assert_equals(internals.updateStyleAndLayoutAndReturnAffectedElementCount(), 3, "Subtree style recalc");
|
| assert_equals(getComputedStyle(r4).backgroundColor, "rgb(0, 128, 0)", "Background color is green after class change");
|
| }, "Descendant with compound selector containing universal");
|
|
|
| @@ -163,7 +163,7 @@ test(function() {
|
| assert_equals(getComputedStyle(r5b).backgroundColor, "rgba(0, 0, 0, 0)", "Background color b should initially be transparent");
|
|
|
| t5.className = "t5";
|
| - assert_equals(internals.updateStyleAndReturnAffectedElementCount(), 5, "Subtree style recalc");
|
| + assert_equals(internals.updateStyleAndLayoutAndReturnAffectedElementCount(), 5, "Subtree style recalc");
|
| assert_equals(getComputedStyle(r5a).backgroundColor, "rgb(0, 128, 0)", "Background color a is green after class change");
|
| assert_equals(getComputedStyle(r5b).backgroundColor, "rgb(0, 128, 0)", "Background color b is green after class change");
|
| }, "Descendant with :-webkit-any containing compound selector");
|
| @@ -172,7 +172,7 @@ 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(), 4, "Subtree style recalc");
|
| + assert_equals(internals.updateStyleAndLayoutAndReturnAffectedElementCount(), 4, "Subtree style recalc");
|
| assert_equals(getComputedStyle(r6).backgroundColor, "rgb(0, 128, 0)", "Background color is green after class change");
|
| }, "Sibling with compound descendant containing id");
|
|
|
| @@ -180,7 +180,7 @@ test(function() {
|
| assert_equals(getComputedStyle(r7).backgroundColor, "rgba(0, 0, 0, 0)", "Background color should initially be transparent");
|
|
|
| t7.className = "t7";
|
| - assert_equals(internals.updateStyleAndReturnAffectedElementCount(), 3, "Subtree style recalc");
|
| + assert_equals(internals.updateStyleAndLayoutAndReturnAffectedElementCount(), 3, "Subtree style recalc");
|
| // TODO(ericwilligers): Update Blink's implementation of sibling selector invalidation, so the following passes:
|
| assert_equals(getComputedStyle(r7).backgroundColor, "rgb(0, 128, 0)", "Background color is green after class change");
|
| }, "Sibling with compound descendant");
|
| @@ -189,7 +189,7 @@ test(function() {
|
| assert_equals(getComputedStyle(r8).backgroundColor, "rgba(0, 0, 0, 0)", "Background color should initially be transparent");
|
|
|
| t8.className = "t8";
|
| - assert_equals(internals.updateStyleAndReturnAffectedElementCount(), 4, "Subtree style recalc");
|
| + assert_equals(internals.updateStyleAndLayoutAndReturnAffectedElementCount(), 4, "Subtree style recalc");
|
| assert_equals(getComputedStyle(r8).backgroundColor, "rgb(0, 128, 0)", "Background color is green after class change");
|
| }, "Compound sibling selector containing id");
|
|
|
| @@ -197,7 +197,7 @@ test(function() {
|
| assert_equals(getComputedStyle(r9).backgroundColor, "rgba(0, 0, 0, 0)", "Background color should initially be transparent");
|
|
|
| t9.className = "t9";
|
| - assert_equals(internals.updateStyleAndReturnAffectedElementCount(), 3, "Subtree style recalc");
|
| + assert_equals(internals.updateStyleAndLayoutAndReturnAffectedElementCount(), 3, "Subtree style recalc");
|
| assert_equals(getComputedStyle(r9).backgroundColor, "rgb(0, 128, 0)", "Background color is green after class change");
|
| }, "Compound sibling selector");
|
|
|
| @@ -206,7 +206,7 @@ test(function() {
|
| assert_equals(getComputedStyle(r10b).backgroundColor, "rgba(0, 0, 0, 0)", "Background color b should initially be transparent");
|
|
|
| t10.className = "t10";
|
| - assert_equals(internals.updateStyleAndReturnAffectedElementCount(), 5, "Subtree style recalc");
|
| + assert_equals(internals.updateStyleAndLayoutAndReturnAffectedElementCount(), 5, "Subtree style recalc");
|
| assert_equals(getComputedStyle(r10a).backgroundColor, "rgb(0, 128, 0)", "Background color a is green after class change");
|
| assert_equals(getComputedStyle(r10b).backgroundColor, "rgb(0, 128, 0)", "Background color b is green after class change");
|
| }, "Sibling with descendant :-webkit-any containing compound selector");
|
|
|