Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(90)

Unified Diff: third_party/WebKit/LayoutTests/compositing/overflow/scroller-with-border-radius.html

Issue 2393443002: Adjust compositing tests to be SPv2-compatible. (Closed)
Patch Set: none Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/LayoutTests/compositing/overflow/scroller-with-border-radius.html
diff --git a/third_party/WebKit/LayoutTests/compositing/overflow/scroller-with-border-radius.html b/third_party/WebKit/LayoutTests/compositing/overflow/scroller-with-border-radius.html
index 3f408907eae96ee774f6e60ed37351769e5b9f77..6650536d76dc62bd259885a3486a35b39a928ab4 100644
--- a/third_party/WebKit/LayoutTests/compositing/overflow/scroller-with-border-radius.html
+++ b/third_party/WebKit/LayoutTests/compositing/overflow/scroller-with-border-radius.html
@@ -1,4 +1,5 @@
<!DOCTYPE HTML>
+<script src="resources/composited-scroll.js"></script>
<style>
#scroller {
overflow: scroll;
@@ -27,18 +28,6 @@
<div id="fixed"></div>
</div>
<script>
-function isUsingCompositedScrolling(layer) {
- if (layer.bounds[1] == 1000)
- return true;
- if (layer.children) {
- for (var i = 0; i < layer.children.length; i++) {
- if (isUsingCompositedScrolling(layer.children[i]))
- return true;
- }
- }
- return false;
-}
-
if (window.internals)
window.internals.settings.setPreferCompositingToLCDTextEnabled(true);
@@ -52,7 +41,7 @@ var result = "";
onload = function() {
if (window.internals) {
result += "No border radius (should be using composited scrolling): ";
- if (isUsingCompositedScrolling(JSON.parse(window.internals.layerTreeAsText(document))))
+ if (isUsingCompositedScrolling(JSON.parse(window.internals.layerTreeAsText(document, window.internals.OUTPUT_CHILDREN_AS_LAYER_LIST))))
result += "Pass.\n";
else
result += "Fail.\n"
@@ -61,7 +50,7 @@ onload = function() {
requestAnimationFrame(function() {
if (window.internals) {
result += "Has border radius (should not be using composited scrolling): ";
- if (!isUsingCompositedScrolling(JSON.parse(window.internals.layerTreeAsText(document))))
+ if (!isUsingCompositedScrolling(JSON.parse(window.internals.layerTreeAsText(document, window.internals.OUTPUT_CHILDREN_AS_LAYER_LIST))))
result += "Pass.\n";
else
result += "Fail.\n"

Powered by Google App Engine
This is Rietveld 408576698