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

third_party/WebKit/LayoutTests/inspector/tracing/timeline-style-recalc-all-invalidator-types.html

Index: third_party/WebKit/LayoutTests/inspector/tracing/timeline-style-recalc-all-invalidator-types.html
diff --git a/third_party/WebKit/LayoutTests/inspector/tracing/timeline-style-recalc-all-invalidator-types.html b/third_party/WebKit/LayoutTests/inspector/tracing/timeline-style-recalc-all-invalidator-types.html
index ddf7ccb313dcaead817f772ab3e43feeadf61c17..4e1c0f7bfd6ed59c46ee798112d3b408128cb71f 100644
--- a/third_party/WebKit/LayoutTests/inspector/tracing/timeline-style-recalc-all-invalidator-types.html
+++ b/third_party/WebKit/LayoutTests/inspector/tracing/timeline-style-recalc-all-invalidator-types.html
@@ -83,7 +83,7 @@ function test()
         function testClassName(next)
         {
             InspectorTest.invokeAsyncWithTimeline("changeClassNameAndDisplay", function() {
-                var record = InspectorTest.findFirstTimelineRecord(WebInspector.TimelineModel.RecordType.UpdateLayoutTree);
+                var record = InspectorTest.findFirstTimelineRecord(WebInspector.TimelineModel.RecordType.UpdateStyleAndLayoutTree);
                 InspectorTest.addArray(record._event.invalidationTrackingEvents, InspectorTest.InvalidationFormatters);
                 next();
             });
@@ -92,7 +92,7 @@ function test()
         function testIdWithoutStyleChange(next)
         {
             InspectorTest.invokeAsyncWithTimeline("changeIdWithoutStyleChangeAndDisplay", function() {
-                var record = InspectorTest.findFirstTimelineRecord(WebInspector.TimelineModel.RecordType.UpdateLayoutTree);
+                var record = InspectorTest.findFirstTimelineRecord(WebInspector.TimelineModel.RecordType.UpdateStyleAndLayoutTree);
                 InspectorTest.assertTrue(record === undefined, "There should be no style recalculation for an id change without style changes.");
                 next();
             });
@@ -101,7 +101,7 @@ function test()
         function testId(next)
         {
             InspectorTest.invokeAsyncWithTimeline("changeIdAndDisplay", function() {
-                var record = InspectorTest.findFirstTimelineRecord(WebInspector.TimelineModel.RecordType.UpdateLayoutTree);
+                var record = InspectorTest.findFirstTimelineRecord(WebInspector.TimelineModel.RecordType.UpdateStyleAndLayoutTree);
                 InspectorTest.addArray(record._event.invalidationTrackingEvents, InspectorTest.InvalidationFormatters);
                 next();
             });
@@ -110,7 +110,7 @@ function test()
         function testStyleAttributeChange(next)
         {
             InspectorTest.invokeAsyncWithTimeline("changeStyleAttributeAndDisplay", function() {
-                var record = InspectorTest.findFirstTimelineRecord(WebInspector.TimelineModel.RecordType.UpdateLayoutTree);
+                var record = InspectorTest.findFirstTimelineRecord(WebInspector.TimelineModel.RecordType.UpdateStyleAndLayoutTree);
                 InspectorTest.addArray(record._event.invalidationTrackingEvents, InspectorTest.InvalidationFormatters);
                 next();
             });
@@ -119,7 +119,7 @@ function test()
         function testAttributeChange(next)
         {
             InspectorTest.invokeAsyncWithTimeline("changeAttributeAndDisplay", function() {
-                var record = InspectorTest.findFirstTimelineRecord(WebInspector.TimelineModel.RecordType.UpdateLayoutTree);
+                var record = InspectorTest.findFirstTimelineRecord(WebInspector.TimelineModel.RecordType.UpdateStyleAndLayoutTree);
                 InspectorTest.addArray(record._event.invalidationTrackingEvents, InspectorTest.InvalidationFormatters);
                 next();
             });
@@ -128,7 +128,7 @@ function test()
         function testPseudoChange(next)
         {
             InspectorTest.invokeAsyncWithTimeline("changePseudoAndDisplay", function() {
-                var record = InspectorTest.findFirstTimelineRecord(WebInspector.TimelineModel.RecordType.UpdateLayoutTree);
+                var record = InspectorTest.findFirstTimelineRecord(WebInspector.TimelineModel.RecordType.UpdateStyleAndLayoutTree);
                 InspectorTest.addArray(record._event.invalidationTrackingEvents, InspectorTest.InvalidationFormatters);
                 next();
             });