Use testRunner instead of layoutTestController in compositing tests

https://bugs.webkit.org/show_bug.cgi?id=88766

Reviewed by Tony Chang.

* compositing/:
* compositing/animation/:
* compositing/backface-visibility/:
* compositing/backing/:
* compositing/culling/:
* compositing/geometry/:
* compositing/iframes/:
* compositing/iframes/resources/:
* compositing/images/:
* compositing/layer-creation/:
* compositing/masks/:
* compositing/overflow/:
* compositing/plugins/:
* compositing/reflections/:
* compositing/repaint/:
* compositing/resources/:
* compositing/rtl/:
* compositing/scaling/:
* compositing/tiling/:
* compositing/transitions/:
* compositing/video/:
* compositing/visibility/:
* compositing/webgl/:
* platform/chromium/compositing/:
* platform/chromium/compositing/force-compositing-mode/:
* platform/chromium/compositing/rubberbanding/:
* platform/mac/compositing/canvas/:


git-svn-id: svn://svn.chromium.org/blink/trunk@119992 bbb929c8-8fbe-4397-9dbb-9b2b20218538

14 files changed, 48 insertions, 48 deletions

diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-overflow-scrolled.html b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-overflow-scrolled.html
index f2740a7..34ecf43 100644
--- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-overflow-scrolled.html
+++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-overflow-scrolled.html
@@ -38,9 +38,9 @@
 </style>
 <script>
     function doTest() {
-        if (window.layoutTestController) {
-            layoutTestController.waitUntilDone();
-            layoutTestController.dumpAsText(true);
+        if (window.testRunner) {
+            testRunner.waitUntilDone();
+            testRunner.dumpAsText(true);
         }
 
         // The far left coordinate of the document varies by window width.
@@ -50,10 +50,10 @@
 
         window.setTimeout(function() {
             window.scrollTo(offset, 0);
-            if (window.layoutTestController) {
+            if (window.testRunner) {
                 if (top == self)
-                    document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
-                layoutTestController.notifyDone();
+                    document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
+                testRunner.notifyDone();
             }
         }, 0);
     }
diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-overflow.html b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-overflow.html
index b8f877a..ddbe371 100644
--- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-overflow.html
+++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute-overflow.html
@@ -38,10 +38,10 @@
 </style>
 <script>
     function doTest() {
-        if (window.layoutTestController) {
+        if (window.testRunner) {
             if (top == self)
-                document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
-            layoutTestController.dumpAsText(true);
+                document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
+            testRunner.dumpAsText(true);
         }
     }
     window.addEventListener('load', doTest, false);
diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute.html b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute.html
index d2ff5d2..0ffad8b 100644
--- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute.html
+++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-absolute.html
@@ -39,10 +39,10 @@
 </style>
 <script>
     function doTest() {
-        if (window.layoutTestController) {
+        if (window.testRunner) {
             if (top == self)
-                document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
-            layoutTestController.dumpAsText(true);
+                document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
+            testRunner.dumpAsText(true);
         }
     }
     window.addEventListener('load', doTest, false);
diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-overflow-scrolled.html b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-overflow-scrolled.html
index df2ae8a..5785f6b 100644
--- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-overflow-scrolled.html
+++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-overflow-scrolled.html
@@ -38,9 +38,9 @@
 </style>
 <script>
     function doTest() {
-        if (window.layoutTestController) {
-            layoutTestController.waitUntilDone();
-            layoutTestController.dumpAsText(true);
+        if (window.testRunner) {
+            testRunner.waitUntilDone();
+            testRunner.dumpAsText(true);
         }
 
         // The far left coordinate of the document varies by window width.
@@ -48,10 +48,10 @@
 
         window.setTimeout(function() {
             window.scrollTo(offset, 0);
-            if (window.layoutTestController) {
+            if (window.testRunner) {
                 if (top == self)
-                    document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
-                layoutTestController.notifyDone();
+                    document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
+                testRunner.notifyDone();
             }
         }, 0);
     }
diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-overflow.html b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-overflow.html
index df6f4d1..c0d21fd 100644
--- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-overflow.html
+++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed-overflow.html
@@ -38,10 +38,10 @@
 </style>
 <script>
     function doTest() {
-        if (window.layoutTestController) {
+        if (window.testRunner) {
             if (top == self)
-                document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
-            layoutTestController.dumpAsText(true);
+                document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
+            testRunner.dumpAsText(true);
         }
     }
     window.addEventListener('load', doTest, false);
diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed.html b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed.html
index 3bce527..3aa11dd 100644
--- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed.html
+++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-fixed.html
@@ -38,10 +38,10 @@
 </style>
 <script>
     function doTest() {
-        if (window.layoutTestController) {
+        if (window.testRunner) {
             if (top == self)
-                document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
-            layoutTestController.dumpAsText(true);
+                document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
+            testRunner.dumpAsText(true);
         }
     }
     window.addEventListener('load', doTest, false);
diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow-scrolled.html b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow-scrolled.html
index 08e2c15..9d37203 100644
--- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow-scrolled.html
+++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow-scrolled.html
@@ -22,9 +22,9 @@
 </style>
 <script>
     function doTest() {
-        if (window.layoutTestController) {
-            document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
-            layoutTestController.dumpAsText(true);
+        if (window.testRunner) {
+            document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
+            testRunner.dumpAsText(true);
         }
     }
     window.addEventListener('load', doTest, false);
diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow.html b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow.html
index 759b03f..9a5e6bc 100644
--- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow.html
+++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow.html
@@ -22,9 +22,9 @@
 </style>
 <script>
     function doTest() {
-        if (window.layoutTestController) {
-            document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
-            layoutTestController.dumpAsText(true);
+        if (window.testRunner) {
+            document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
+            testRunner.dumpAsText(true);
         }
     }
     window.addEventListener('load', doTest, false);
diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute.html b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute.html
index e871e84e..0011de2 100644
--- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute.html
+++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-absolute.html
@@ -22,9 +22,9 @@
 </style>
 <script>
     function doTest() {
-        if (window.layoutTestController) {
-            document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
-            layoutTestController.dumpAsText(true);
+        if (window.testRunner) {
+            document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
+            testRunner.dumpAsText(true);
         }
     }
     window.addEventListener('load', doTest, false);
diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow-scrolled.html b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow-scrolled.html
index d2bc038..690092c 100644
--- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow-scrolled.html
+++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow-scrolled.html
@@ -22,9 +22,9 @@
 </style>
 <script>
     function doTest() {
-        if (window.layoutTestController) {
-            document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
-            layoutTestController.dumpAsText(true);
+        if (window.testRunner) {
+            document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
+            testRunner.dumpAsText(true);
         }
     }
     window.addEventListener('load', doTest, false);
diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow.html b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow.html
index 33f1f20..ef4ea83 100644
--- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow.html
+++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow.html
@@ -22,9 +22,9 @@
 </style>
 <script>
     function doTest() {
-        if (window.layoutTestController) {
-            document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
-            layoutTestController.dumpAsText(true);
+        if (window.testRunner) {
+            document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
+            testRunner.dumpAsText(true);
         }
     }
     window.addEventListener('load', doTest, false);
diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed.html b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed.html
index cd6939c..465f066 100644
--- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed.html
+++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-fixed.html
@@ -22,9 +22,9 @@
 </style>
 <script>
     function doTest() {
-        if (window.layoutTestController) {
-            document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
-            layoutTestController.dumpAsText(true);
+        if (window.testRunner) {
+            document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
+            testRunner.dumpAsText(true);
         }
     }
     window.addEventListener('load', doTest, false);
diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-relative.html b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-relative.html
index 65184753..ee4ae70 100644
--- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-relative.html
+++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-iframe-relative.html
@@ -31,9 +31,9 @@
 </style>
 <script>
     function doTest() {
-        if (window.layoutTestController) {
-            document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
-            layoutTestController.dumpAsText(true);
+        if (window.testRunner) {
+            document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
+            testRunner.dumpAsText(true);
         }
     }
     window.addEventListener('load', doTest, false);
diff --git a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-relative.html b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-relative.html
index 956670b..977cfbc 100644
--- a/third_party/WebKit/LayoutTests/compositing/rtl/rtl-relative.html
+++ b/third_party/WebKit/LayoutTests/compositing/rtl/rtl-relative.html
@@ -33,10 +33,10 @@
 </style>
 <script>
     function doTest() {
-        if (window.layoutTestController) {
+        if (window.testRunner) {
             if (top == self)
-                document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
-            layoutTestController.dumpAsText(true);
+                document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
+            testRunner.dumpAsText(true);
         }
     }
     window.addEventListener('load', doTest, false);