| Index: LayoutTests/inspector/tracing/timeline-style-recalc-with-invalidations.html
|
| diff --git a/LayoutTests/inspector/tracing/timeline-style-recalc-with-invalidations.html b/LayoutTests/inspector/tracing/timeline-style-recalc-with-invalidations.html
|
| index f19c38d7931ac267554fa1ea48c04e78516e3aaa..40f90c01f17ab5cd3173fbfa29738f59effe0c9e 100644
|
| --- a/LayoutTests/inspector/tracing/timeline-style-recalc-with-invalidations.html
|
| +++ b/LayoutTests/inspector/tracing/timeline-style-recalc-with-invalidations.html
|
| @@ -59,16 +59,8 @@ function test()
|
| {
|
| InspectorTest.invokeAsyncWithTimeline("changeStylesAndDisplay", function() {
|
| var record = InspectorTest.findFirstTimelineRecord(WebInspector.TimelineModel.RecordType.RecalculateStyles);
|
| - var invalidations = record._event.invalidationTrackingEvents;
|
| - InspectorTest.assertEquals(invalidations.length, 2);
|
| - InspectorTest.assertEquals(invalidations[0].type, WebInspector.TimelineModel.RecordType.StyleRecalcInvalidationTracking);
|
| - InspectorTest.assertEquals(invalidations[0].nodeName, "DIV id='testElementOne'");
|
| - InspectorTest.assertEquals(invalidations[0].cause.reason, "Inline CSS style declaration was mutated");
|
| - InspectorTest.assertGreaterOrEqual(invalidations[0].cause.stackTrace.length, 1);
|
| - InspectorTest.assertEquals(invalidations[1].type, WebInspector.TimelineModel.RecordType.StyleRecalcInvalidationTracking);
|
| - InspectorTest.assertEquals(invalidations[1].nodeName, "DIV id='testElementTwo'");
|
| - InspectorTest.assertEquals(invalidations[1].cause.reason, "Inline CSS style declaration was mutated");
|
| - InspectorTest.assertGreaterOrEqual(invalidations[1].cause.stackTrace.length, 1);
|
| + InspectorTest.addArray(record._event.invalidationTrackingEvents, InspectorTest.InvalidationFormatters, "", "first recalc style invalidations");
|
| +
|
| next();
|
| });
|
| },
|
| @@ -77,40 +69,14 @@ function test()
|
| {
|
| InspectorTest.invokeAsyncWithTimeline("changeMultipleStylesAndDisplay", function() {
|
| var firstRecord = InspectorTest.findTimelineRecord(WebInspector.TimelineModel.RecordType.RecalculateStyles, 0);
|
| - var firstInvalidations = firstRecord._event.invalidationTrackingEvents;
|
| - InspectorTest.assertEquals(firstInvalidations.length, 1);
|
| - InspectorTest.assertEquals(firstInvalidations[0].type, WebInspector.TimelineModel.RecordType.StyleRecalcInvalidationTracking);
|
| - InspectorTest.assertEquals(firstInvalidations[0].nodeName, "DIV id='testElementOne'");
|
| - InspectorTest.assertEquals(firstInvalidations[0].cause.reason, "Inline CSS style declaration was mutated");
|
| - InspectorTest.assertGreaterOrEqual(firstInvalidations[0].cause.stackTrace.length, 1);
|
| + InspectorTest.addArray(firstRecord._event.invalidationTrackingEvents, InspectorTest.InvalidationFormatters, "", "first recalc style invalidations");
|
|
|
| var secondRecord = InspectorTest.findTimelineRecord(WebInspector.TimelineModel.RecordType.RecalculateStyles, 1);
|
| - var secondInvalidations = secondRecord._event.invalidationTrackingEvents;
|
| - InspectorTest.assertEquals(secondInvalidations.length, 2);
|
| - InspectorTest.assertEquals(secondInvalidations[0].type, WebInspector.TimelineModel.RecordType.StyleRecalcInvalidationTracking);
|
| - InspectorTest.assertEquals(secondInvalidations[0].nodeName, "DIV id='testElementOne'");
|
| - InspectorTest.assertEquals(secondInvalidations[0].cause.reason, "Inline CSS style declaration was mutated");
|
| - InspectorTest.assertGreaterOrEqual(secondInvalidations[0].cause.stackTrace.length, 1);
|
| - InspectorTest.assertEquals(secondInvalidations[1].type, WebInspector.TimelineModel.RecordType.StyleRecalcInvalidationTracking);
|
| - InspectorTest.assertEquals(secondInvalidations[1].nodeName, "DIV id='testElementTwo'");
|
| - InspectorTest.assertEquals(secondInvalidations[1].cause.reason, "Inline CSS style declaration was mutated");
|
| - InspectorTest.assertGreaterOrEqual(secondInvalidations[1].cause.stackTrace.length, 1);
|
| + InspectorTest.addArray(secondRecord._event.invalidationTrackingEvents, InspectorTest.InvalidationFormatters, "", "second recalc style invalidations");
|
|
|
| var thirdRecord = InspectorTest.findTimelineRecord(WebInspector.TimelineModel.RecordType.RecalculateStyles, 2);
|
| - var thirdInvalidations = thirdRecord._event.invalidationTrackingEvents;
|
| - InspectorTest.assertEquals(thirdInvalidations.length, 3);
|
| - InspectorTest.assertEquals(thirdInvalidations[0].type, WebInspector.TimelineModel.RecordType.StyleRecalcInvalidationTracking);
|
| - InspectorTest.assertEquals(thirdInvalidations[0].nodeName, "DIV id='testElementOne'");
|
| - InspectorTest.assertEquals(thirdInvalidations[0].cause.reason, "Inline CSS style declaration was mutated");
|
| - InspectorTest.assertGreaterOrEqual(thirdInvalidations[0].cause.stackTrace.length, 1);
|
| - InspectorTest.assertEquals(thirdInvalidations[1].type, WebInspector.TimelineModel.RecordType.StyleRecalcInvalidationTracking);
|
| - InspectorTest.assertEquals(thirdInvalidations[1].nodeName, "DIV id='testElementTwo'");
|
| - InspectorTest.assertEquals(thirdInvalidations[1].cause.reason, "Inline CSS style declaration was mutated");
|
| - InspectorTest.assertGreaterOrEqual(thirdInvalidations[1].cause.stackTrace.length, 1);
|
| - InspectorTest.assertEquals(thirdInvalidations[2].type, WebInspector.TimelineModel.RecordType.StyleRecalcInvalidationTracking);
|
| - InspectorTest.assertEquals(thirdInvalidations[2].nodeName, "DIV id='testElementThree'");
|
| - InspectorTest.assertEquals(thirdInvalidations[2].cause.reason, "Inline CSS style declaration was mutated");
|
| - InspectorTest.assertGreaterOrEqual(thirdInvalidations[2].cause.stackTrace.length, 1);
|
| + InspectorTest.addArray(thirdRecord._event.invalidationTrackingEvents, InspectorTest.InvalidationFormatters, "", "third recalc style invalidations");
|
| +
|
| next();
|
| });
|
| },
|
| @@ -119,17 +85,8 @@ function test()
|
| {
|
| InspectorTest.invokeAsyncWithTimeline("changeSubframeStylesAndDisplay", function() {
|
| var record = InspectorTest.findFirstTimelineRecord(WebInspector.TimelineModel.RecordType.RecalculateStyles);
|
| + InspectorTest.addArray(record._event.invalidationTrackingEvents, InspectorTest.InvalidationFormatters, "", "first recalc style invalidations");
|
|
|
| - var invalidations = record._event.invalidationTrackingEvents;
|
| - InspectorTest.assertEquals(invalidations.length, 2);
|
| - InspectorTest.assertEquals(invalidations[0].type, WebInspector.TimelineModel.RecordType.StyleRecalcInvalidationTracking);
|
| - InspectorTest.assertEquals(invalidations[0].nodeName, "BODY");
|
| - InspectorTest.assertEquals(invalidations[0].cause.reason, "Inline CSS style declaration was mutated");
|
| - InspectorTest.assertGreaterOrEqual(invalidations[0].cause.stackTrace.length, 1);
|
| - InspectorTest.assertEquals(invalidations[1].type, WebInspector.TimelineModel.RecordType.StyleRecalcInvalidationTracking);
|
| - InspectorTest.assertEquals(invalidations[1].nodeName, "DIV");
|
| - InspectorTest.assertEquals(invalidations[1].cause.reason, "Inline CSS style declaration was mutated");
|
| - InspectorTest.assertGreaterOrEqual(invalidations[1].cause.stackTrace.length, 1);
|
| next();
|
| });
|
| }
|
|
|