Commit ab3e2c03 authored by Steve Kobes's avatar Steve Kobes Committed by Commit Bot

Remove RLS checks in layout tests.

Bug: 823365
Change-Id: I29537cc8d749eb426a9ae5624789b95b34121b13
Reviewed-on: https://chromium-review.googlesource.com/1042802Reviewed-by: default avatarPhilip Rogers <pdr@chromium.org>
Commit-Queue: Steve Kobes <skobes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#556038}
parent 856d84ec
...@@ -15,10 +15,6 @@ ...@@ -15,10 +15,6 @@
assert_not_equals(window.internals, null, 'This test requires window.internals'); assert_not_equals(window.internals, null, 'This test requires window.internals');
var layers_text = internals.layerTreeAsText(document); var layers_text = internals.layerTreeAsText(document);
var layers = JSON.parse(layers_text); var layers = JSON.parse(layers_text);
if (internals.runtimeFlags.rootLayerScrollingEnabled) { assert_equals(layers['layers'].length, 5);
assert_equals(layers['layers'].length, 5);
} else {
assert_equals(layers['layers'].length, 3);
}
}, 'Having a composited child should be a position:fixed compositing trigger and should result in the fixed element getting a layer.'); }, 'Having a composited child should be a position:fixed compositing trigger and should result in the fixed element getting a layer.');
</script> </script>
...@@ -13,10 +13,6 @@ if (window.internals) ...@@ -13,10 +13,6 @@ if (window.internals)
test(function() { test(function() {
var json = JSON.parse(window.internals.layerTreeAsText(document)); var json = JSON.parse(window.internals.layerTreeAsText(document));
// The <select> element's scroller should be painted into the root layer. // The <select> element's scroller should be painted into the root layer.
if (internals.runtimeFlags.rootLayerScrollingEnabled) { assert_equals(json["layers"].length, 3);
assert_equals(json["layers"].length, 3); }, "test");
} else {
assert_equals(json["layers"].length, 1);
}
}, "test");
</script> </script>
...@@ -8,10 +8,6 @@ if (window.internals) ...@@ -8,10 +8,6 @@ if (window.internals)
test(function() { test(function() {
var json = JSON.parse(window.internals.layerTreeAsText(document)); var json = JSON.parse(window.internals.layerTreeAsText(document));
// The <input> element's scroller should be painted into the root layer. // The <input> element's scroller should be painted into the root layer.
if (internals.runtimeFlags.rootLayerScrollingEnabled) { assert_equals(json["layers"].length, 3);
assert_equals(json["layers"].length, 3); }, "test");
} else {
assert_equals(json["layers"].length, 1);
}
}, "test");
</script> </script>
...@@ -24,7 +24,7 @@ onload = function() { ...@@ -24,7 +24,7 @@ onload = function() {
target.style.transform = "translateX(10px)"; target.style.transform = "translateX(10px)";
if (window.internals) { if (window.internals) {
var layers = JSON.parse(internals.layerTreeAsText(document, 1))["layers"] var layers = JSON.parse(internals.layerTreeAsText(document, 1))["layers"]
var nonAnimatedDIVLayer = internals.runtimeFlags.rootLayerScrollingEnabled ? layers[4] : layers[2]; var nonAnimatedDIVLayer = layers[4];
assert_true(nonAnimatedDIVLayer.compositingReasons[1] == "Layer was separately composited because it could not be squashed."); assert_true(nonAnimatedDIVLayer.compositingReasons[1] == "Layer was separately composited because it could not be squashed.");
assert_true(nonAnimatedDIVLayer.squashingDisallowedReasons[0] == "Cannot squash into a layer that is animating."); assert_true(nonAnimatedDIVLayer.squashingDisallowedReasons[0] == "Cannot squash into a layer that is animating.");
} }
......
...@@ -9,7 +9,7 @@ if (window.testRunner) ...@@ -9,7 +9,7 @@ if (window.testRunner)
onload = function() { onload = function() {
if (window.internals) { if (window.internals) {
var layers = JSON.parse(internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_DEBUG_INFO))["layers"]; var layers = JSON.parse(internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_DEBUG_INFO))["layers"];
var nonBlendDIVlayer = internals.runtimeFlags.rootLayerScrollingEnabled ? layers[5] : layers[3]; var nonBlendDIVlayer = layers[5];
assert_true(nonBlendDIVlayer.compositingReasons[1] == "Layer was separately composited because it could not be squashed."); assert_true(nonBlendDIVlayer.compositingReasons[1] == "Layer was separately composited because it could not be squashed.");
assert_true(nonBlendDIVlayer.squashingDisallowedReasons[0] == "Squashing a layer with blending is not supported."); assert_true(nonBlendDIVlayer.squashingDisallowedReasons[0] == "Squashing a layer with blending is not supported.");
} }
......
...@@ -18,8 +18,8 @@ onload = function() { ...@@ -18,8 +18,8 @@ onload = function() {
if (window.internals) { if (window.internals) {
var layers = JSON.parse(internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_DEBUG_INFO))["layers"]; var layers = JSON.parse(internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_DEBUG_INFO))["layers"];
var willChangeDIVLayer = internals.runtimeFlags.rootLayerScrollingEnabled ? layers[4] : layers[2]; var willChangeDIVLayer = layers[4];
var scaleTransformDIVLayer = internals.runtimeFlags.rootLayerScrollingEnabled ? layers[5] : layers[3]; var scaleTransformDIVLayer = layers[5];
// Both transformed layers squash together after the will-change layer. // Both transformed layers squash together after the will-change layer.
assert_true(willChangeDIVLayer.compositingReasons[0] == "Has a will-change compositing hint"); assert_true(willChangeDIVLayer.compositingReasons[0] == "Has a will-change compositing hint");
assert_true(scaleTransformDIVLayer.compositingReasons[0] == "Secondary layer, home for a group of squashable content"); assert_true(scaleTransformDIVLayer.compositingReasons[0] == "Secondary layer, home for a group of squashable content");
......
...@@ -19,7 +19,7 @@ async_test(function(t) { ...@@ -19,7 +19,7 @@ async_test(function(t) {
var layerTree = internals.layerTreeAsText( var layerTree = internals.layerTreeAsText(
document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS);
var layers = JSON.parse(layerTree)['layers']; var layers = JSON.parse(layerTree)['layers'];
var scrollingContentsLayer = internals.runtimeFlags.rootLayerScrollingEnabled ? layers[2] : layers[0]; var scrollingContentsLayer = layers[2];
var paintInvalidations = scrollingContentsLayer.paintInvalidations; var paintInvalidations = scrollingContentsLayer.paintInvalidations;
internals.stopTrackingRepaints(document); internals.stopTrackingRepaints(document);
......
...@@ -41,7 +41,7 @@ runAfterLayoutAndPaint(function() { ...@@ -41,7 +41,7 @@ runAfterLayoutAndPaint(function() {
return; return;
var layers_dump = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS); var layers_dump = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_PAINT_INVALIDATIONS);
var layers = JSON.parse(layers_dump).layers; var layers = JSON.parse(layers_dump).layers;
var scrollingContentsLayer = internals.runtimeFlags.rootLayerScrollingEnabled ? layers[2] : layers[0]; var scrollingContentsLayer = layers[2];
var paintInvalidations = scrollingContentsLayer.paintInvalidations; var paintInvalidations = scrollingContentsLayer.paintInvalidations;
var shadowRect = [1.4, 1.4, 100, 100]; var shadowRect = [1.4, 1.4, 100, 100];
assert_true(paintInvalidations.some(paintInvalidation => rectContainsRect(paintInvalidation.rect, shadowRect)), assert_true(paintInvalidations.some(paintInvalidation => rectContainsRect(paintInvalidation.rect, shadowRect)),
......
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