Rename (updateLayout/updateStyle).*.() to updateStyleAndLayout.*.()

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

Index: third_party/WebKit/LayoutTests/fast/css/invalidation/invalidation-set-not.html
diff --git a/third_party/WebKit/LayoutTests/fast/css/invalidation/invalidation-set-not.html b/third_party/WebKit/LayoutTests/fast/css/invalidation/invalidation-set-not.html
index 82b6916ec1b930fb260bb8a68e0c86b6d5202e46..6ef914e3b6fcadeb3db6e43278c4323a4d6b1672 100644
--- a/third_party/WebKit/LayoutTests/fast/css/invalidation/invalidation-set-not.html
+++ b/third_party/WebKit/LayoutTests/fast/css/invalidation/invalidation-set-not.html
@@ -78,7 +78,7 @@ test(function() {
     assert_equals(getComputedStyle(t1).backgroundColor, "rgba(0, 0, 0, 0)", "Background color should initially be transparent");
 
     t1.className = "";
-    assert_equals(internals.updateStyleAndReturnAffectedElementCount(), 1, "Single element style recalc");
+    assert_equals(internals.updateStyleAndLayoutAndReturnAffectedElementCount(), 1, "Single element style recalc");
     assert_equals(getComputedStyle(t1).backgroundColor, "rgb(0, 128, 0)", "Background color is green after class change");
 }, "Negated class without combinators");
 
@@ -86,7 +86,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(), 1, "Recalc changed element and #r2");
+    assert_equals(internals.updateStyleAndLayoutAndReturnAffectedElementCount(), 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");
 
@@ -94,7 +94,7 @@ test(function() {
     assert_equals(getComputedStyle(r3).backgroundColor, "rgba(0, 0, 0, 0)", "Background color should initially be transparent");
 
     t3.className = "";
-    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");
 }, "Negated class descendant of negated class");
 
@@ -102,7 +102,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");
 }, "Negated class descendant of class");
 
@@ -110,7 +110,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(), 1, "Recalc changed element and #r5");
+    assert_equals(internals.updateStyleAndLayoutAndReturnAffectedElementCount(), 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");
 
@@ -118,7 +118,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(), 1, "Recalc changed element and #r6");
+    assert_equals(internals.updateStyleAndLayoutAndReturnAffectedElementCount(), 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");
 
@@ -126,7 +126,7 @@ test(function() {
     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(internals.updateStyleAndLayoutAndReturnAffectedElementCount(), 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");
 
@@ -134,7 +134,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(), 3, "Subtree style recalc");
+    assert_equals(internals.updateStyleAndLayoutAndReturnAffectedElementCount(), 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");