Skip to content

GitLab

T
tangled
Commit 52da6cbc authored by pdr@chromium.org's avatar pdr@chromium.org
Browse files
Options

Clean up the individual invalidation tests to be self contained. 

This patch cleans up the individual invalidation tests to always call
next() directly instead of relying on the previous test to call
invokeAsyncWithTimeline.

BUG=410701

Review URL: https://codereview.chromium.org/674963003

git-svn-id: svn://svn.chromium.org/blink/trunk@184304 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent ee4e35f0
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 49 deletions
third_party/WebKit/LayoutTests/inspector/tracing/timeline-paint-with-layout-invalidations-on-deleted-node.html
View file @ 52da6cbc
......@@ -52,30 +52,34 @@ function test()
InspectorTest.assertEquals(invalidations[3].type, WebInspector.TracingTimelineModel.RecordType.LayoutInvalidationTracking);
InspectorTest.assertEquals(invalidations[3].nodeName, "DIV id='testElement'");
InspectorTest.assertGreaterOrEqual(invalidations[3].stackTrace.length, 1);
InspectorTest.invokeAsyncWithTimeline("updateSubframeAndDisplay", next);
next();
});
},
function testSubframe(next)
{
// The first paint corresponds to the local frame and should have no invalidations.
var firstPaintRecord = InspectorTest.findFirstTimelineRecord(WebInspector.TimelineModel.RecordType.Paint);
var firstInvalidations = firstPaintRecord._event.invalidationTrackingEvents;
InspectorTest.assertEquals(firstInvalidations, undefined);
InspectorTest.invokeAsyncWithTimeline("updateSubframeAndDisplay", function() {
// The first paint corresponds to the local frame and should have no invalidations.
var firstPaintRecord = InspectorTest.findFirstTimelineRecord(WebInspector.TimelineModel.RecordType.Paint);
var firstInvalidations = firstPaintRecord._event.invalidationTrackingEvents;
InspectorTest.assertEquals(firstInvalidations, undefined);
// The second paint corresponds to the subframe and should have our layout/style invalidations.
var secondPaintRecord = InspectorTest.findTimelineRecord(WebInspector.TimelineModel.RecordType.Paint, 1);
var secondInvalidations = secondPaintRecord._event.invalidationTrackingEvents;
InspectorTest.assertEquals(secondInvalidations.length, 3);
InspectorTest.assertEquals(secondInvalidations[0].type, WebInspector.TracingTimelineModel.RecordType.StyleRecalcInvalidationTracking);
InspectorTest.assertEquals(secondInvalidations[0].nodeName, "DIV");
InspectorTest.assertEquals(secondInvalidations[1].type, WebInspector.TracingTimelineModel.RecordType.LayoutInvalidationTracking);
InspectorTest.assertEquals(secondInvalidations[1].nodeName, "DIV");
InspectorTest.assertGreaterOrEqual(secondInvalidations[1].stackTrace.length, 1);
InspectorTest.assertEquals(secondInvalidations[2].type, WebInspector.TracingTimelineModel.RecordType.LayoutInvalidationTracking);
InspectorTest.assertEquals(secondInvalidations[2].nodeName, "DIV");
InspectorTest.assertGreaterOrEqual(secondInvalidations[2].stackTrace.length, 1);
// The second paint corresponds to the subframe and should have our layout/style invalidations.
var secondPaintRecord = InspectorTest.findTimelineRecord(WebInspector.TimelineModel.RecordType.Paint, 1);
var secondInvalidations = secondPaintRecord._event.invalidationTrackingEvents;
InspectorTest.assertEquals(secondInvalidations.length, 3);
InspectorTest.assertEquals(secondInvalidations[0].type, WebInspector.TracingTimelineModel.RecordType.StyleRecalcInvalidationTracking);
InspectorTest.assertEquals(secondInvalidations[0].nodeName, "DIV");
InspectorTest.assertEquals(secondInvalidations[1].type, WebInspector.TracingTimelineModel.RecordType.LayoutInvalidationTracking);
InspectorTest.assertEquals(secondInvalidations[1].nodeName, "DIV");
InspectorTest.assertGreaterOrEqual(secondInvalidations[1].stackTrace.length, 1);
InspectorTest.assertEquals(secondInvalidations[2].type, WebInspector.TracingTimelineModel.RecordType.LayoutInvalidationTracking);
InspectorTest.assertEquals(secondInvalidations[2].nodeName, "DIV");
InspectorTest.assertGreaterOrEqual(secondInvalidations[2].stackTrace.length, 1);
next();
next();
});
}
]);
}
......
third_party/WebKit/LayoutTests/inspector/tracing/timeline-paint-with-layout-invalidations.html
View file @ 52da6cbc
......@@ -45,30 +45,34 @@ function test()
InspectorTest.assertEquals(invalidations[2].type, WebInspector.TracingTimelineModel.RecordType.LayoutInvalidationTracking);
InspectorTest.assertEquals(invalidations[2].nodeName, "DIV id='testElement'");
InspectorTest.assertGreaterOrEqual(invalidations[2].stackTrace.length, 1);
InspectorTest.invokeAsyncWithTimeline("updateSubframeAndDisplay", next);
next();
});
},
function testSubframe(next)
{
// The first paint corresponds to the local frame and should have no invalidations.
var firstPaintRecord = InspectorTest.findFirstTimelineRecord(WebInspector.TimelineModel.RecordType.Paint);
var firstInvalidations = firstPaintRecord._event.invalidationTrackingEvents;
InspectorTest.assertEquals(firstInvalidations, undefined);
InspectorTest.invokeAsyncWithTimeline("updateSubframeAndDisplay", function() {
// The first paint corresponds to the local frame and should have no invalidations.
var firstPaintRecord = InspectorTest.findFirstTimelineRecord(WebInspector.TimelineModel.RecordType.Paint);
var firstInvalidations = firstPaintRecord._event.invalidationTrackingEvents;
InspectorTest.assertEquals(firstInvalidations, undefined);
// The second paint corresponds to the subframe and should have our layout/style invalidations.
var secondPaintRecord = InspectorTest.findTimelineRecord(WebInspector.TimelineModel.RecordType.Paint, 1);
var secondInvalidations = secondPaintRecord._event.invalidationTrackingEvents;
InspectorTest.assertEquals(secondInvalidations.length, 3);
InspectorTest.assertEquals(secondInvalidations[0].type, WebInspector.TracingTimelineModel.RecordType.StyleRecalcInvalidationTracking);
InspectorTest.assertEquals(secondInvalidations[0].nodeName, "DIV");
InspectorTest.assertEquals(secondInvalidations[1].type, WebInspector.TracingTimelineModel.RecordType.LayoutInvalidationTracking);
InspectorTest.assertEquals(secondInvalidations[1].nodeName, "DIV");
InspectorTest.assertGreaterOrEqual(secondInvalidations[1].stackTrace.length, 1);
InspectorTest.assertEquals(secondInvalidations[2].type, WebInspector.TracingTimelineModel.RecordType.LayoutInvalidationTracking);
InspectorTest.assertEquals(secondInvalidations[2].nodeName, "#document");
InspectorTest.assertGreaterOrEqual(secondInvalidations[2].stackTrace.length, 1);
// The second paint corresponds to the subframe and should have our layout/style invalidations.
var secondPaintRecord = InspectorTest.findTimelineRecord(WebInspector.TimelineModel.RecordType.Paint, 1);
var secondInvalidations = secondPaintRecord._event.invalidationTrackingEvents;
InspectorTest.assertEquals(secondInvalidations.length, 3);
InspectorTest.assertEquals(secondInvalidations[0].type, WebInspector.TracingTimelineModel.RecordType.StyleRecalcInvalidationTracking);
InspectorTest.assertEquals(secondInvalidations[0].nodeName, "DIV");
InspectorTest.assertEquals(secondInvalidations[1].type, WebInspector.TracingTimelineModel.RecordType.LayoutInvalidationTracking);
InspectorTest.assertEquals(secondInvalidations[1].nodeName, "DIV");
InspectorTest.assertGreaterOrEqual(secondInvalidations[1].stackTrace.length, 1);
InspectorTest.assertEquals(secondInvalidations[2].type, WebInspector.TracingTimelineModel.RecordType.LayoutInvalidationTracking);
InspectorTest.assertEquals(secondInvalidations[2].nodeName, "#document");
InspectorTest.assertGreaterOrEqual(secondInvalidations[2].stackTrace.length, 1);
next();
next();
});
}
]);
}
......
third_party/WebKit/LayoutTests/inspector/tracing/timeline-paint-with-style-recalc-invalidations.html
View file @ 52da6cbc
......@@ -42,25 +42,29 @@ function test()
InspectorTest.assertEquals(invalidations[1].type, WebInspector.TracingTimelineModel.RecordType.StyleRecalcInvalidationTracking);
InspectorTest.assertEquals(invalidations[1].nodeName, "DIV id='testElement'");
InspectorTest.assertEquals(invalidations[1].reason, "StyleSheetChange");
InspectorTest.invokeAsyncWithTimeline("updateSubframeAndDisplay", next);
next();
});
},
function testSubframe(next)
{
// The first paint corresponds to the local frame and should have no invalidations.
var firstPaintRecord = InspectorTest.findFirstTimelineRecord(WebInspector.TimelineModel.RecordType.Paint);
var firstInvalidations = firstPaintRecord._event.invalidationTrackingEvents;
InspectorTest.assertEquals(firstInvalidations, undefined);
InspectorTest.invokeAsyncWithTimeline("updateSubframeAndDisplay", function() {
// The first paint corresponds to the local frame and should have no invalidations.
var firstPaintRecord = InspectorTest.findFirstTimelineRecord(WebInspector.TimelineModel.RecordType.Paint);
var firstInvalidations = firstPaintRecord._event.invalidationTrackingEvents;
InspectorTest.assertEquals(firstInvalidations, undefined);
// The second paint corresponds to the subframe and should have our style invalidations.
var secondPaintRecord = InspectorTest.findTimelineRecord(WebInspector.TimelineModel.RecordType.Paint, 1);
var secondInvalidations = secondPaintRecord._event.invalidationTrackingEvents;
InspectorTest.assertEquals(secondInvalidations.length, 1);
InspectorTest.assertEquals(secondInvalidations[0].type, WebInspector.TracingTimelineModel.RecordType.StyleRecalcInvalidationTracking);
InspectorTest.assertEquals(secondInvalidations[0].nodeName, "DIV");
InspectorTest.assertEquals(secondInvalidations[0].reason, "StyleSheetChange");
// The second paint corresponds to the subframe and should have our style invalidations.
var secondPaintRecord = InspectorTest.findTimelineRecord(WebInspector.TimelineModel.RecordType.Paint, 1);
var secondInvalidations = secondPaintRecord._event.invalidationTrackingEvents;
InspectorTest.assertEquals(secondInvalidations.length, 1);
InspectorTest.assertEquals(secondInvalidations[0].type, WebInspector.TracingTimelineModel.RecordType.StyleRecalcInvalidationTracking);
InspectorTest.assertEquals(secondInvalidations[0].nodeName, "DIV");
InspectorTest.assertEquals(secondInvalidations[0].reason, "StyleSheetChange");
next();
next();
});
}
]);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment