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

third_party/WebKit/LayoutTests/fast/css/invalidation/class-sibling-universal.html

Index: third_party/WebKit/LayoutTests/fast/css/invalidation/class-sibling-universal.html
diff --git a/third_party/WebKit/LayoutTests/fast/css/invalidation/class-sibling-universal.html b/third_party/WebKit/LayoutTests/fast/css/invalidation/class-sibling-universal.html
index 05179b7c181f5a263e907d05240fb5feca37577f..76f3ecede92e7c6c53d66d67445c721d486c7366 100644
--- a/third_party/WebKit/LayoutTests/fast/css/invalidation/class-sibling-universal.html
+++ b/third_party/WebKit/LayoutTests/fast/css/invalidation/class-sibling-universal.html
@@ -90,7 +90,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(), 3, "Subtree style recalc");
+    assert_equals(internals.updateStyleAndLayoutAndReturnAffectedElementCount(), 3, "Subtree style recalc");
     assert_equals(getComputedStyle(r1).backgroundColor, "rgb(0, 128, 0)", "Background color is green after class change");
 }, "Adjacent with universal selector");
 
@@ -98,7 +98,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(), 4, "Subtree style recalc");
+    assert_equals(internals.updateStyleAndLayoutAndReturnAffectedElementCount(), 4, "Subtree style recalc");
     assert_equals(getComputedStyle(r2).backgroundColor, "rgb(0, 128, 0)", "Background color is green after class change");
 }, "Indirect adjacent with universal selector");
 
@@ -109,7 +109,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");
 }, "Adjacent with universal :hover selector");
 
@@ -117,7 +117,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(), 1, "Subtree style recalc");
+    assert_equals(internals.updateStyleAndLayoutAndReturnAffectedElementCount(), 1, "Subtree style recalc");
     assert_equals(getComputedStyle(r4).backgroundColor, "rgb(0, 128, 0)", "Background color is green after class change");
 }, "Class change affecting selector for sibling class");
 
@@ -125,7 +125,7 @@ test(function() {
     assert_equals(getComputedStyle(r5).backgroundColor, "rgba(0, 0, 0, 0)", "Background color should initially be transparent");
 
     t5.className = "t5";
-    assert_equals(internals.updateStyleAndReturnAffectedElementCount(), 1, "Subtree style recalc");
+    assert_equals(internals.updateStyleAndLayoutAndReturnAffectedElementCount(), 1, "Subtree style recalc");
     assert_equals(getComputedStyle(r5).backgroundColor, "rgb(0, 128, 0)", "Background color is green after class change");
 }, "Class change affecting all sibling subtrees through a universal selector");
 
@@ -133,7 +133,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, "Subtree style recalc");
+    assert_equals(internals.updateStyleAndLayoutAndReturnAffectedElementCount(), 1, "Subtree style recalc");
     assert_equals(getComputedStyle(r6).backgroundColor, "rgb(0, 128, 0)", "Background color is green after class change");
 }, "Class change affecting all sibling subtrees through an indirect adjacent combinator");
 
@@ -141,7 +141,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(), 2, "Subtree style recalc");
+    assert_equals(internals.updateStyleAndLayoutAndReturnAffectedElementCount(), 2, "Subtree style recalc");
     assert_equals(getComputedStyle(r7).backgroundColor, "rgb(0, 128, 0)", "Background color is green after class change");
 }, "Class change affecting sibling descendants through a universal selector");
 
@@ -149,7 +149,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(), 2, "Subtree style recalc");
+    assert_equals(internals.updateStyleAndLayoutAndReturnAffectedElementCount(), 2, "Subtree style recalc");
     assert_equals(getComputedStyle(r8).backgroundColor, "rgb(0, 128, 0)", "Background color is green after class change");
 }, "Class change affecting universal descendants of webkit-any sibling");