Use testRunner instead of layoutTestController in compositing tests
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 11 Jun 2012 18:29:22 +0000 (18:29 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 11 Jun 2012 18:29:22 +0000 (18:29 +0000)
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: https://svn.webkit.org/repository/webkit/trunk@119992 268f45cc-cd09-0410-ab3c-d52691b4dbfc

273 files changed:
LayoutTests/ChangeLog
LayoutTests/compositing/absolute-position-changed-in-composited-layer.html
LayoutTests/compositing/absolute-position-changed-with-composited-parent-layer.html
LayoutTests/compositing/animation/animation-compositing.html
LayoutTests/compositing/animation/state-at-end-event-transform-layer.html
LayoutTests/compositing/backface-visibility/backface-visibility-3d.html
LayoutTests/compositing/backface-visibility/backface-visibility-hierarchical-transform.html
LayoutTests/compositing/backface-visibility/backface-visibility-non3d.html
LayoutTests/compositing/backface-visibility/backface-visibility-simple.html
LayoutTests/compositing/backing/no-backing-for-clip-overlap.html
LayoutTests/compositing/backing/no-backing-for-clip.html
LayoutTests/compositing/backing/no-backing-for-perspective.html
LayoutTests/compositing/backing/no-backing-foreground-layer.html
LayoutTests/compositing/bounds-in-flipped-writing-mode.html
LayoutTests/compositing/checkerboard.html
LayoutTests/compositing/clip-change.html
LayoutTests/compositing/clip-child-by-non-stacking-ancestor.html
LayoutTests/compositing/composited-negative-zindex-child.html
LayoutTests/compositing/culling/clear-fixed-iframe.html
LayoutTests/compositing/culling/filter-occlusion-alpha-large.html
LayoutTests/compositing/culling/filter-occlusion-alpha.html
LayoutTests/compositing/culling/filter-occlusion-blur-large.html
LayoutTests/compositing/culling/filter-occlusion-blur.html
LayoutTests/compositing/culling/scrolled-within-boxshadow.html
LayoutTests/compositing/culling/tile-occlusion-boundaries.html
LayoutTests/compositing/culling/translated-boxshadow.html
LayoutTests/compositing/culling/unscrolled-within-boxshadow.html
LayoutTests/compositing/fixed-position-changed-in-composited-layer.html
LayoutTests/compositing/fixed-position-changed-within-composited-parent-layer.html
LayoutTests/compositing/flat-with-transformed-child.html
LayoutTests/compositing/geometry/ancestor-overflow-change.html
LayoutTests/compositing/geometry/bounds-clipped-composited-child.html
LayoutTests/compositing/geometry/clip.html
LayoutTests/compositing/geometry/clipped-video-controller.html
LayoutTests/compositing/geometry/composited-in-columns.html
LayoutTests/compositing/geometry/empty-embed-rects.html
LayoutTests/compositing/geometry/fixed-position-composited-page-scale-down.html
LayoutTests/compositing/geometry/fixed-position-composited-page-scale.html
LayoutTests/compositing/geometry/fixed-position-composited-switch.html
LayoutTests/compositing/geometry/fixed-position-iframe-composited-page-scale-down.html
LayoutTests/compositing/geometry/fixed-position-iframe-composited-page-scale.html
LayoutTests/compositing/geometry/fixed-position-transform-composited-page-scale-down.html
LayoutTests/compositing/geometry/fixed-position-transform-composited-page-scale.html
LayoutTests/compositing/geometry/flipped-blocks-inline-mapping.html
LayoutTests/compositing/geometry/flipped-writing-mode.html
LayoutTests/compositing/geometry/foreground-layer.html
LayoutTests/compositing/geometry/foreground-offset-change.html
LayoutTests/compositing/geometry/horizontal-scroll-composited.html
LayoutTests/compositing/geometry/huge-layer.html
LayoutTests/compositing/geometry/layer-due-to-layer-children-deep-switch.html
LayoutTests/compositing/geometry/layer-due-to-layer-children-deep.html
LayoutTests/compositing/geometry/layer-due-to-layer-children-switch.html
LayoutTests/compositing/geometry/layer-due-to-layer-children.html
LayoutTests/compositing/geometry/limit-layer-bounds-clipping-ancestor.html
LayoutTests/compositing/geometry/limit-layer-bounds-fixed-positioned.html
LayoutTests/compositing/geometry/limit-layer-bounds-opacity-transition.html
LayoutTests/compositing/geometry/limit-layer-bounds-overflow-repaint.html
LayoutTests/compositing/geometry/limit-layer-bounds-overflow-root.html
LayoutTests/compositing/geometry/limit-layer-bounds-positioned-transition.html
LayoutTests/compositing/geometry/limit-layer-bounds-positioned.html
LayoutTests/compositing/geometry/limit-layer-bounds-transformed-overflow.html
LayoutTests/compositing/geometry/limit-layer-bounds-transformed.html
LayoutTests/compositing/geometry/object-clip-rects-assertion.html
LayoutTests/compositing/geometry/outline-change.html
LayoutTests/compositing/geometry/partial-layout-update.html
LayoutTests/compositing/geometry/preserve-3d-switching.html
LayoutTests/compositing/geometry/repaint-foreground-layer.html
LayoutTests/compositing/geometry/root-layer-update.html
LayoutTests/compositing/geometry/rtl-composited.html
LayoutTests/compositing/geometry/vertical-scroll-composited.html
LayoutTests/compositing/geometry/video-fixed-scrolling.html
LayoutTests/compositing/geometry/video-opacity-overlay.html
LayoutTests/compositing/iframes/become-composited-nested-iframes.html
LayoutTests/compositing/iframes/become-overlapped-iframe.html
LayoutTests/compositing/iframes/composited-iframe-scroll.html
LayoutTests/compositing/iframes/composited-parent-iframe.html
LayoutTests/compositing/iframes/connect-compositing-iframe-delayed.html
LayoutTests/compositing/iframes/connect-compositing-iframe.html
LayoutTests/compositing/iframes/connect-compositing-iframe2.html
LayoutTests/compositing/iframes/connect-compositing-iframe3.html
LayoutTests/compositing/iframes/enter-compositing-iframe.html
LayoutTests/compositing/iframes/iframe-content-flipping.html
LayoutTests/compositing/iframes/iframe-copy-on-scroll.html
LayoutTests/compositing/iframes/iframe-in-composited-layer.html
LayoutTests/compositing/iframes/iframe-resize.html
LayoutTests/compositing/iframes/iframe-size-from-zero.html
LayoutTests/compositing/iframes/iframe-size-to-zero.html
LayoutTests/compositing/iframes/iframe-src-change.html
LayoutTests/compositing/iframes/invisible-nested-iframe-hide.html
LayoutTests/compositing/iframes/invisible-nested-iframe-show.html
LayoutTests/compositing/iframes/layout-on-compositing-change.html
LayoutTests/compositing/iframes/leave-compositing-iframe.html
LayoutTests/compositing/iframes/nested-composited-iframe.html
LayoutTests/compositing/iframes/nested-iframe-scrolling.html
LayoutTests/compositing/iframes/overlapped-iframe-iframe.html
LayoutTests/compositing/iframes/overlapped-iframe.html
LayoutTests/compositing/iframes/overlapped-nested-iframes.html
LayoutTests/compositing/iframes/page-cache-layer-tree.html
LayoutTests/compositing/iframes/remove-iframe-crash.html
LayoutTests/compositing/iframes/repaint-after-losing-scrollbars.html
LayoutTests/compositing/iframes/resizer.html
LayoutTests/compositing/iframes/resources/fixed-position-subframe.html
LayoutTests/compositing/iframes/resources/fixed-position-transformed-subframe.html
LayoutTests/compositing/iframes/resources/scrollgrandchild-inner.html
LayoutTests/compositing/iframes/scrolling-iframe.html
LayoutTests/compositing/images/clip-on-directly-composited-image.html
LayoutTests/compositing/images/content-image-change.html
LayoutTests/compositing/images/content-image.html
LayoutTests/compositing/layer-creation/fixed-position-and-transform.html
LayoutTests/compositing/layer-creation/fixed-position-out-of-view.html
LayoutTests/compositing/layer-creation/fixed-position-scroll.html
LayoutTests/compositing/layer-creation/fixed-position-under-transform.html
LayoutTests/compositing/layer-creation/no-compositing-for-preserve-3d.html
LayoutTests/compositing/layer-creation/overflow-scroll-overlap.html
LayoutTests/compositing/layer-creation/overlap-animation.html
LayoutTests/compositing/layer-creation/overlap-child-layer.html
LayoutTests/compositing/layer-creation/overlap-clipping.html
LayoutTests/compositing/layer-creation/overlap-transformed-and-clipped.html
LayoutTests/compositing/layer-creation/overlap-transformed-layer.html
LayoutTests/compositing/layer-creation/overlap-transforms.html
LayoutTests/compositing/layer-creation/rotate3d-overlap.html
LayoutTests/compositing/layer-creation/scroll-partial-update.html
LayoutTests/compositing/layer-creation/spanOverlapsCanvas.html
LayoutTests/compositing/layer-creation/stacking-context-overlap-nested.html
LayoutTests/compositing/layer-creation/stacking-context-overlap.html
LayoutTests/compositing/layer-creation/translatez-overlap.html
LayoutTests/compositing/layers-inside-overflow-scroll.html
LayoutTests/compositing/masks/layer-mask-placement.html
LayoutTests/compositing/overflow-trumps-transform-style.html
LayoutTests/compositing/overflow/clip-content-under-overflow-controls.html
LayoutTests/compositing/overflow/clip-descendents.html
LayoutTests/compositing/overflow/content-gains-scrollbars.html
LayoutTests/compositing/overflow/content-loses-scrollbars.html
LayoutTests/compositing/overflow/get-transform-from-non-box-container.html
LayoutTests/compositing/overflow/overflow-compositing-descendant.html
LayoutTests/compositing/overflow/overflow-positioning.html
LayoutTests/compositing/overflow/overflow-scaled-descendant-overlapping.html
LayoutTests/compositing/overflow/overflow-scroll.html
LayoutTests/compositing/overflow/overflow-scrollbar-layers.html
LayoutTests/compositing/overflow/repaint-after-losing-scrollbars.html
LayoutTests/compositing/overflow/resize-painting.html
LayoutTests/compositing/overflow/scroll-ancestor-update.html
LayoutTests/compositing/overflow/scrollbar-painting.html
LayoutTests/compositing/overflow/theme-affects-visual-overflow.html
LayoutTests/compositing/overflow/transform-in-empty-container.html
LayoutTests/compositing/plugins/1x1-composited-plugin.html
LayoutTests/compositing/plugins/invalidate_rect.html
LayoutTests/compositing/plugins/large-to-small-composited-plugin.html
LayoutTests/compositing/plugins/small-to-large-composited-plugin.html
LayoutTests/compositing/reflections/animation-inside-reflection.html
LayoutTests/compositing/reflections/become-simple-composited-reflection.html
LayoutTests/compositing/reflections/compositing-change-inside-reflection.html
LayoutTests/compositing/reflections/empty-reflection-with-mask.html
LayoutTests/compositing/reflections/load-video-in-reflection.html
LayoutTests/compositing/reflections/nested-reflection-anchor-point.html
LayoutTests/compositing/reflections/nested-reflection-animated.html
LayoutTests/compositing/reflections/nested-reflection-mask-change.html
LayoutTests/compositing/reflections/nested-reflection-on-overflow.html
LayoutTests/compositing/reflections/nested-reflection-opacity.html
LayoutTests/compositing/reflections/nested-reflection-size-change.html
LayoutTests/compositing/reflections/nested-reflection-transformed.html
LayoutTests/compositing/reflections/nested-reflection-transformed2.html
LayoutTests/compositing/reflections/nested-reflection-transition.html
LayoutTests/compositing/reflections/nested-reflection.html
LayoutTests/compositing/reflections/reflection-opacity.html
LayoutTests/compositing/reflections/reflection-positioning.html
LayoutTests/compositing/reflections/reflection-positioning2.html
LayoutTests/compositing/reflections/remove-add-reflection.html
LayoutTests/compositing/reflections/remove-reflection.html
LayoutTests/compositing/reflections/transform-inside-reflection.html
LayoutTests/compositing/repaint/become-overlay-composited-layer.html
LayoutTests/compositing/repaint/composited-document-element.html
LayoutTests/compositing/repaint/content-into-overflow.html
LayoutTests/compositing/repaint/inline-repaint-container.html
LayoutTests/compositing/repaint/layer-repaint-rects.html
LayoutTests/compositing/repaint/layer-repaint.html
LayoutTests/compositing/repaint/newly-composited-repaint-rect.html
LayoutTests/compositing/repaint/opacity-between-absolute.html
LayoutTests/compositing/repaint/opacity-between-absolute2.html
LayoutTests/compositing/repaint/overflow-into-content.html
LayoutTests/compositing/repaint/same-size-invalidation.html
LayoutTests/compositing/repaint/shrink-layer.html
LayoutTests/compositing/repaint/transform-style-change.html
LayoutTests/compositing/resources/media-testing.js
LayoutTests/compositing/rtl/rtl-absolute-overflow-scrolled.html
LayoutTests/compositing/rtl/rtl-absolute-overflow.html
LayoutTests/compositing/rtl/rtl-absolute.html
LayoutTests/compositing/rtl/rtl-fixed-overflow-scrolled.html
LayoutTests/compositing/rtl/rtl-fixed-overflow.html
LayoutTests/compositing/rtl/rtl-fixed.html
LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow-scrolled.html
LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow.html
LayoutTests/compositing/rtl/rtl-iframe-absolute.html
LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow-scrolled.html
LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow.html
LayoutTests/compositing/rtl/rtl-iframe-fixed.html
LayoutTests/compositing/rtl/rtl-iframe-relative.html
LayoutTests/compositing/rtl/rtl-relative.html
LayoutTests/compositing/scaling/tiled-layer-recursion.html
LayoutTests/compositing/scroll-painted-composited-content.html
LayoutTests/compositing/scrollbar-painting.html
LayoutTests/compositing/self-painting-layers.html
LayoutTests/compositing/self-painting-layers2.html
LayoutTests/compositing/sibling-positioning.html
LayoutTests/compositing/text-on-large-layer.html
LayoutTests/compositing/tiled-layers-hidpi.html
LayoutTests/compositing/tiling/constrained-layer-size.html
LayoutTests/compositing/tiling/crash-huge-layer.html
LayoutTests/compositing/tiling/crash-reparent-tiled-layer.html
LayoutTests/compositing/tiling/huge-layer-add-remove-child.html-disabled
LayoutTests/compositing/tiling/huge-layer-img.html-disabled
LayoutTests/compositing/tiling/huge-layer-resize.html-disabled
LayoutTests/compositing/tiling/huge-layer-with-layer-children-resize.html-disabled
LayoutTests/compositing/tiling/huge-layer-with-layer-children.html-disabled
LayoutTests/compositing/tiling/huge-layer.html-disabled
LayoutTests/compositing/toggle-compositing.html
LayoutTests/compositing/transitions/opacity-on-inline.html
LayoutTests/compositing/video-page-visibility.html
LayoutTests/compositing/video/video-background-color.html
LayoutTests/compositing/video/video-poster-expected.txt
LayoutTests/compositing/video/video-poster.html
LayoutTests/compositing/video/video-with-invalid-source.html
LayoutTests/compositing/visibility/compositing-and-visibility-turned-off-together.html
LayoutTests/compositing/visibility/hidden-iframe.html
LayoutTests/compositing/visibility/layer-visible-content.html
LayoutTests/compositing/visibility/visibility-image-layers-dynamic.html
LayoutTests/compositing/visibility/visibility-image-layers.html
LayoutTests/compositing/visibility/visibility-simple-canvas2d-layer.html
LayoutTests/compositing/visibility/visibility-simple-video-layer.html
LayoutTests/compositing/visibility/visibility-simple-webgl-layer.html
LayoutTests/compositing/webgl/webgl-background-color.html
LayoutTests/compositing/webgl/webgl-no-alpha.html
LayoutTests/compositing/webgl/webgl-nonpremultiplied-blend.html
LayoutTests/compositing/webgl/webgl-reflection.html
LayoutTests/platform/chromium/compositing/3d-corners.html
LayoutTests/platform/chromium/compositing/accelerated-drawing/alpha.html
LayoutTests/platform/chromium/compositing/accelerated-drawing/svg-filters.html
LayoutTests/platform/chromium/compositing/backface-visibility-transformed.html
LayoutTests/platform/chromium/compositing/child-layer-3d-sorting.html
LayoutTests/platform/chromium/compositing/empty-render-surface-crasher.html
LayoutTests/platform/chromium/compositing/filters/background-filter-blur-off-axis.html
LayoutTests/platform/chromium/compositing/filters/background-filter-blur-outsets.html
LayoutTests/platform/chromium/compositing/filters/background-filter-blur.html
LayoutTests/platform/chromium/compositing/force-compositing-mode/force-composite-empty.html
LayoutTests/platform/chromium/compositing/force-compositing-mode/no-overflow-iframe-layer.html
LayoutTests/platform/chromium/compositing/force-compositing-mode/overflow-hidden-iframe-layer.html
LayoutTests/platform/chromium/compositing/force-compositing-mode/overflow-iframe-enter-compositing.html
LayoutTests/platform/chromium/compositing/force-compositing-mode/overflow-iframe-layer.html
LayoutTests/platform/chromium/compositing/force-compositing-mode/overflow-iframe-leave-compositing.html
LayoutTests/platform/chromium/compositing/huge-layer-rotated.html
LayoutTests/platform/chromium/compositing/huge-mask-layer.html
LayoutTests/platform/chromium/compositing/img-layer-grow.html
LayoutTests/platform/chromium/compositing/layout-width-change.html
LayoutTests/platform/chromium/compositing/lost-compositor-context-permanently.html
LayoutTests/platform/chromium/compositing/lost-compositor-context-twice.html
LayoutTests/platform/chromium/compositing/lost-compositor-context-with-rendersurface.html
LayoutTests/platform/chromium/compositing/lost-compositor-context-with-video.html
LayoutTests/platform/chromium/compositing/lost-compositor-context.html
LayoutTests/platform/chromium/compositing/perpendicular-layer-sorting.html
LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-e.html
LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-n.html
LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-ne.html
LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-nw.html
LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-s.html
LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-se.html
LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-size-change.html
LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-sw.html
LayoutTests/platform/chromium/compositing/rubberbanding/transform-overhang-w.html
LayoutTests/platform/chromium/compositing/scissor-out-of-viewport.html
LayoutTests/platform/chromium/compositing/tiny-layer-rotated.html
LayoutTests/platform/chromium/compositing/video-frame-size-change.html
LayoutTests/platform/chromium/compositing/webgl-loses-compositor-context.html
LayoutTests/platform/mac/compositing/canvas/accelerated-canvas-compositing.html

index 2963f87..65e08ef 100644 (file)
@@ -1,3 +1,38 @@
+2012-06-11  Ryosuke Niwa  <rniwa@webkit.org>
+
+        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/:
+
 2012-06-11  Ojan Vafai  <ojan@chromium.org>
 
         Large slew of Chromium windows png rebaselines. See http://crbug.com/131829 for more information.
index b9a5edd..83ed983 100755 (executable)
@@ -11,8 +11,8 @@
         .composited { -webkit-transform: translateZ(0); }
     </style>
     <script type="text/javascript">
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText(true);
+        if (window.testRunner)
+            testRunner.dumpAsText(true);
         function moveAbsoluteDiv()
         {
             document.getElementById('absoluteDiv').style.top = '700px';
index 1cc5e4e..cecbc57 100755 (executable)
@@ -12,8 +12,8 @@
         .composited { -webkit-transform: translateZ(0); }
     </style>
     <script type="text/javascript">
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText(true);
+        if (window.testRunner)
+            testRunner.dumpAsText(true);
         function moveAbsoluteDiv()
         {
             document.getElementById('absoluteDiv').style.top = '700px';
index 86f8dcd..d0270b9 100644 (file)
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     function doTest()
     {
       var box = document.getElementById('box');
       box.addEventListener('webkitAnimationStart', function() {
-        if (window.layoutTestController) {
-            var layers = layoutTestController.layerTreeAsText();
+        if (window.testRunner) {
+            var layers = testRunner.layerTreeAsText();
             var result;
             if (layers != "")
               result = "PASS: created compositing layers when animating transform.";
             else
               result = "FAIL: no layers found";
             document.getElementById('result').innerHTML = result;
-            layoutTestController.notifyDone();
+            testRunner.notifyDone();
         }
       }, false);
       document.getElementById('box').className = 'spinning';
index b66f600..2c0e47a 100644 (file)
 
     function testEnded()
     {
-      if (window.layoutTestController)
-        layoutTestController.notifyDone();
+      if (window.testRunner)
+        testRunner.notifyDone();
     }
     
     function startTest()
     {
-      if (window.layoutTestController)
-        layoutTestController.waitUntilDone();
+      if (window.testRunner)
+        testRunner.waitUntilDone();
 
       document.getElementById('tester').addEventListener('webkitAnimationEnd', testEnded, false);
       document.getElementById('container').className = 'moved';
index a538f09..473be4a 100644 (file)
 </div>
 
 <script>
-  if (window.layoutTestController) {
-      layoutTestController.dumpAsText(true);  // This is only useful as a pixel test.
+  if (window.testRunner) {
+      testRunner.dumpAsText(true);  // This is only useful as a pixel test.
       document.write("<span style='position:absolute; top:-5000px'>This test is only useful as a pixel test</span>");
   }
 </script>
index 9a55092..58f14d8 100644 (file)
   </div>
 
   <script>
-  if (window.layoutTestController) {
-    layoutTestController.dumpAsText(true);  // This is only useful as a pixel test.
+  if (window.testRunner) {
+    testRunner.dumpAsText(true);  // This is only useful as a pixel test.
     document.write("<span style='position:absolute; top:-5000px'>This test is only useful as a pixel test</span>");
   }
   </script>
index 0a59f86..142d23f 100644 (file)
@@ -74,8 +74,8 @@
 </div>
 
 <script>
-  if (window.layoutTestController) {
-      layoutTestController.dumpAsText(true);  // This is only useful as a pixel test.
+  if (window.testRunner) {
+      testRunner.dumpAsText(true);  // This is only useful as a pixel test.
       document.write("<span style='position:absolute; top:-5000px'>This test is only useful as a pixel test</span>");
   }
 </script>
index d16e148..b108a44 100644 (file)
@@ -37,8 +37,8 @@
     </div>
   </div>
   <script>
-  if (window.layoutTestController) {
-    layoutTestController.dumpAsText(true);  // This is only useful as a pixel test.
+  if (window.testRunner) {
+    testRunner.dumpAsText(true);  // This is only useful as a pixel test.
     document.write("<span style='position:absolute; top:-5000px'>This test is only useful as a pixel test</span>");
   }
   </script>
index 685de81..38a277c 100644 (file)
   </style>
 
   <script>
-  if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+  if (window.testRunner)
+    testRunner.dumpAsText();
     
   function dumpLayers()
   {
     var layersResult = document.getElementById('layers');
-    if (window.layoutTestController)
-      layersResult.innerText = layoutTestController.layerTreeAsText();
+    if (window.testRunner)
+      layersResult.innerText = testRunner.layerTreeAsText();
     
   }
   window.addEventListener('load', dumpLayers, false)
index 4604802..b214d5c 100644 (file)
   </style>
 
   <script>
-  if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+  if (window.testRunner)
+    testRunner.dumpAsText();
     
   function dumpLayers()
   {
     var layersResult = document.getElementById('layers');
-    if (window.layoutTestController)
-      layersResult.innerText = layoutTestController.layerTreeAsText();
+    if (window.testRunner)
+      layersResult.innerText = testRunner.layerTreeAsText();
     
   }
   window.addEventListener('load', dumpLayers, false)
index ef10da6..a5825ea 100644 (file)
   </style>
 
   <script>
-  if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+  if (window.testRunner)
+    testRunner.dumpAsText();
     
   function dumpLayers()
   {
     var layersResult = document.getElementById('layers');
-    if (window.layoutTestController)
-      layersResult.innerText = layoutTestController.layerTreeAsText();
+    if (window.testRunner)
+      layersResult.innerText = testRunner.layerTreeAsText();
     
   }
   window.addEventListener('load', dumpLayers, false)
index 9f766ac..f8213ce 100644 (file)
@@ -33,8 +33,8 @@
     }
   </style>
   <script>
-    if (window.layoutTestController)
-      layoutTestController.dumpAsText();
+    if (window.testRunner)
+      testRunner.dumpAsText();
   </script>
 </head>
 <body>
index 1bfbf82..170e018 100644 (file)
@@ -5,9 +5,9 @@
     </div>
     <pre id="console"></pre>
     <script>
-        if (window.layoutTestController) {
-            layoutTestController.dumpAsText();
-            document.getElementById("console").appendChild(document.createTextNode(layoutTestController.layerTreeAsText()));
+        if (window.testRunner) {
+            testRunner.dumpAsText();
+            document.getElementById("console").appendChild(document.createTextNode(testRunner.layerTreeAsText()));
         }
     </script>
 </body>
index 3055b02..ee17cdd 100644 (file)
@@ -4,8 +4,8 @@
     <head>
         <script type="text/javascript">
             function horiz_scroll() {
-                if (window.layoutTestController)
-                    layoutTestController.waitUntilDone();
+                if (window.testRunner)
+                    testRunner.waitUntilDone();
 
                 var pos = 0;
                 var inner = function () {
@@ -13,8 +13,8 @@
                     pos += 15;
                     if (pos < 2047)
                         setTimeout(inner, 0);
-                    else if (window.layoutTestController)
-                        layoutTestController.notifyDone();
+                    else if (window.testRunner)
+                        testRunner.notifyDone();
                 };
                 inner();
             }
index 1d7ad70..ab2b2db 100644 (file)
     }
   </style>
   <script>
-    if (window.layoutTestController)
-      layoutTestController.dumpAsText(true);
+    if (window.testRunner)
+      testRunner.dumpAsText(true);
     function doTest() {
-      if (window.layoutTestController)
-        layoutTestController.display();
+      if (window.testRunner)
+        testRunner.display();
       // The change in clip style should be reflected immediately in the size
       // of the composited clipper layer. After changing the clip, it should
       // entirely cover the indicator.
index c137d4b..5bacc5e 100644 (file)
     </style>
 </head>
 <script>
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     function doTest()
     {
-        if (window.layoutTestController) {
-            document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
-            layoutTestController.notifyDone();
+        if (window.testRunner) {
+            document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
+            testRunner.notifyDone();
         }
     }
 
index 5805793..0686e70 100644 (file)
@@ -22,8 +22,8 @@
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-      layoutTestController.dumpAsText();
+    if (window.testRunner)
+      testRunner.dumpAsText();
 
     function doTest() {
       document.getElementById('child').style.webkitTransform = 'translateZ(0)';
index aace5e1..4cc98ee 100644 (file)
@@ -17,8 +17,8 @@ iframe {
 }
 </style>
 <script type="text/javascript">
-  if (window.layoutTestController) {
-    layoutTestController.dumpAsText(true);
+  if (window.testRunner) {
+    testRunner.dumpAsText(true);
   }
 </script>
 </head>
index 2866938..d5310f6 100644 (file)
@@ -21,8 +21,8 @@
   }
 </style>
 <script type="text/javascript">
-  if (window.layoutTestController) {
-    layoutTestController.dumpAsText(true);
+  if (window.testRunner) {
+    testRunner.dumpAsText(true);
   }
 </script>
 </head>
index e9d3c2e..0fd2f34 100644 (file)
@@ -21,8 +21,8 @@
   }
 </style>
 <script type="text/javascript">
-  if (window.layoutTestController) {
-    layoutTestController.dumpAsText(true);
+  if (window.testRunner) {
+    testRunner.dumpAsText(true);
   }
 </script>
 </head>
index 527664d..a6169c8 100755 (executable)
@@ -19,8 +19,8 @@
   }
 </style>
 <script type="text/javascript">
-  if (window.layoutTestController) {
-    layoutTestController.dumpAsText(true);
+  if (window.testRunner) {
+    testRunner.dumpAsText(true);
   }
 </script>
 </head>
index fc82731..e444be8 100644 (file)
@@ -19,8 +19,8 @@
   }
 </style>
 <script type="text/javascript">
-  if (window.layoutTestController) {
-    layoutTestController.dumpAsText(true);
+  if (window.testRunner) {
+    testRunner.dumpAsText(true);
   }
 </script>
 </head>
index 920204e..fd6b06c 100644 (file)
@@ -33,15 +33,15 @@ body {
 }
 </style>
 <script type="text/javascript">
-  if (window.layoutTestController) {
-    layoutTestController.dumpAsText(true);
-    layoutTestController.waitUntilDone();
+  if (window.testRunner) {
+    testRunner.dumpAsText(true);
+    testRunner.waitUntilDone();
   }
 
   window.onload = function() { setTimeout(function() {
     document.getElementById('scroll').scrollTop += 300;
-    if (window.layoutTestController) {
-      layoutTestController.notifyDone();
+    if (window.testRunner) {
+      testRunner.notifyDone();
     }
   }, 0); };
 </script>
index d339185..68e0588 100644 (file)
@@ -12,8 +12,8 @@
   </style>
 
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText(true);
+    if (window.testRunner) {
+      testRunner.dumpAsText(true);
     }
   </script>
 </head>
index 5e141f5..3dedd22 100644 (file)
@@ -23,8 +23,8 @@ body {
 }
 </style>
 <script type="text/javascript">
-  if (window.layoutTestController) {
-    layoutTestController.dumpAsText(true);
+  if (window.testRunner) {
+    testRunner.dumpAsText(true);
   }
 </script>
 </head>
index 2a0c963..e83529e 100644 (file)
@@ -33,14 +33,14 @@ body {
 }
 </style>
 <script type="text/javascript">
-  if (window.layoutTestController) {
-    layoutTestController.dumpAsText(true);
-    layoutTestController.waitUntilDone();
+  if (window.testRunner) {
+    testRunner.dumpAsText(true);
+    testRunner.waitUntilDone();
   }
 
   window.onload = function() { setTimeout(function() {
-    if (window.layoutTestController) {
-      layoutTestController.notifyDone();
+    if (window.testRunner) {
+      testRunner.notifyDone();
     }
   }, 0); };
 </script>
index 4fe66cf..4783bda 100755 (executable)
@@ -10,8 +10,8 @@
         .composited { -webkit-transform: translateZ(0); }
     </style>
     <script type="text/javascript">
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText(true);
+        if (window.testRunner)
+            testRunner.dumpAsText(true);
         function moveFixedDiv()
         {
             document.getElementById('fixedDiv').style.top = '200px';
index 5c46291..a48944c 100755 (executable)
@@ -11,8 +11,8 @@
         .composited { -webkit-transform: translateZ(0); }
     </style>
     <script type="text/javascript">
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText(true);
+        if (window.testRunner)
+            testRunner.dumpAsText(true);
         function moveFixedDiv()
         {
             document.getElementById('fixedDiv').style.top = '200px';
index 865c924..2dd2444 100644 (file)
@@ -32,8 +32,8 @@
     }
   </style>
   <script>
-    if (window.layoutTestController)
-      layoutTestController.dumpAsText(true);
+    if (window.testRunner)
+      testRunner.dumpAsText(true);
   </script>
 </head>
 <body>
index f92f2b3..aa86609 100644 (file)
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText(true);
-      layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+      testRunner.dumpAsText(true);
+      testRunner.waitUntilDone();
     }
 
     function changeOverflow()
     {
       document.getElementById('container').className = 'changed';
 
-      if (window.layoutTestController)
-        document.getElementById('layers').innerText = layoutTestController.layerTreeAsText();
+      if (window.testRunner)
+        document.getElementById('layers').innerText = testRunner.layerTreeAsText();
       
-      if (window.layoutTestController)
-        layoutTestController.notifyDone();
+      if (window.testRunner)
+        testRunner.notifyDone();
     }
     
     window.addEventListener('load', function() {
index 6b6d949..665abb9 100644 (file)
     }
   </style>
   <script>
-    if (window.layoutTestController)
-      layoutTestController.dumpAsText(true);
+    if (window.testRunner)
+      testRunner.dumpAsText(true);
 
     function dumpLayers()
     {
-      if (window.layoutTestController)
-        document.getElementById('layers').innerText = layoutTestController.layerTreeAsText();
+      if (window.testRunner)
+        document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     }
 
     window.addEventListener('load', dumpLayers, false);
index eadc78f..32fd41f 100644 (file)
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText();
-      layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+      testRunner.dumpAsText();
+      testRunner.waitUntilDone();
     }
       
     function doTest() {
-      if (window.layoutTestController) {
-        document.getElementById('layers').innerText = layoutTestController.layerTreeAsText();
-        layoutTestController.notifyDone();
+      if (window.testRunner) {
+        document.getElementById('layers').innerText = testRunner.layerTreeAsText();
+        testRunner.notifyDone();
       }
     }
     window.addEventListener('load', doTest, false);
index 36aeef8..97e9f7c 100644 (file)
   <script src="../../media/media-file.js"></script>
 
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-      layoutTestController.dumpAsText();
+    if (window.testRunner)
+      testRunner.dumpAsText();
   
     function testDone()
     {
-      if (window.layoutTestController)
-        layoutTestController.notifyDone();
+      if (window.testRunner)
+        testRunner.notifyDone();
     }
 
     function doTest()
index dadf83d..f6721de 100644 (file)
     }
   </style>
   <script>
-    if (window.layoutTestController)
-      layoutTestController.dumpAsText(true);
+    if (window.testRunner)
+      testRunner.dumpAsText(true);
     
     function dumpLayers()
     {
-      if (window.layoutTestController)
-        document.getElementById('layers').innerText = layoutTestController.layerTreeAsText();
+      if (window.testRunner)
+        document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     }
     
     window.addEventListener('load', dumpLayers, false);
index b6d32cb..8d99cfc 100644 (file)
@@ -3,8 +3,8 @@
 <html>
 <head>
     <script type="text/javascript" charset="utf-8">
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
     </script>
 </head>
 <body>
index 94b2797..f335ef2 100644 (file)
@@ -18,8 +18,8 @@
       window.internals.settings.setEnableCompositingForFixedPosition(true);
       window.internals.settings.setPageScaleFactor(0.5, 0, 0);
     }
-    if (window.layoutTestController)
-      layoutTestController.dumpAsText(true);
+    if (window.testRunner)
+      testRunner.dumpAsText(true);
   }
 </script>
 </head>
index 91fa496..eae7a29 100644 (file)
@@ -18,8 +18,8 @@
       window.internals.settings.setEnableCompositingForFixedPosition(true);
       window.internals.settings.setPageScaleFactor(2, 0, 0);
     }
-    if (window.layoutTestController)
-      layoutTestController.dumpAsText(true);
+    if (window.testRunner)
+      testRunner.dumpAsText(true);
   }
 </script>
 </head>
index daad9c9..35fcf85 100644 (file)
 
       // If the fixed position element doesn't have its own stacking context then
       // it cannot get a composited layer.
-      if (window.layoutTestController)
-        layerTreeOutput += 'Before (should be empty): \n' + layoutTestController.layerTreeAsText() + '\n';
+      if (window.testRunner)
+        layerTreeOutput += 'Before (should be empty): \n' + testRunner.layerTreeAsText() + '\n';
 
       // Adding a z-index to the fixed position element will give it a stacking context
       // and allow it to be composited.
       document.getElementById('fixed').style.zIndex = '1';
 
-      if (window.layoutTestController) {
-        layerTreeOutput += 'After (should not be empty): \n' + layoutTestController.layerTreeAsText();
+      if (window.testRunner) {
+        layerTreeOutput += 'After (should not be empty): \n' + testRunner.layerTreeAsText();
         document.getElementById('layertree').innerText = layerTreeOutput;
-        layoutTestController.dumpAsText();
+        testRunner.dumpAsText();
       }
       
       // Adding a transform to the container will turn off compositing.
       document.getElementById('container').style.webkitTransform = 'translateX(0)';
-      if (window.layoutTestController) {
-        layerTreeOutput += 'After (should be empty): \n' + layoutTestController.layerTreeAsText();
+      if (window.testRunner) {
+        layerTreeOutput += 'After (should be empty): \n' + testRunner.layerTreeAsText();
         document.getElementById('layertree').innerText = layerTreeOutput;
-        layoutTestController.dumpAsText();
+        testRunner.dumpAsText();
       }
 
     }
index 8b2f102..2c6a01e 100644 (file)
@@ -18,8 +18,8 @@
       window.internals.settings.setEnableCompositingForFixedPosition(true);
       window.internals.settings.setPageScaleFactor(0.5, 0, 0);
     }
-    if (window.layoutTestController)
-      layoutTestController.dumpAsText(true);
+    if (window.testRunner)
+      testRunner.dumpAsText(true);
 
     var d = document.getElementById('frame').contentDocument.open();
     d.write("<div style='position:fixed; z-index: 1; left; 10px;'>TEST</div>");
index 2024855..8e3d37a 100644 (file)
@@ -18,8 +18,8 @@
       window.internals.settings.setEnableCompositingForFixedPosition(true);
       window.internals.settings.setPageScaleFactor(2, 0, 0);
     }
-    if (window.layoutTestController)
-      layoutTestController.dumpAsText(true);
+    if (window.testRunner)
+      testRunner.dumpAsText(true);
 
     var d = document.getElementById('frame').contentDocument.open();
     d.write("<div style='position:fixed; z-index: 1; left; 10px;'>TEST</div>");
index a27e4ac..21d6082 100644 (file)
@@ -20,8 +20,8 @@
       window.internals.settings.setEnableCompositingForFixedPosition(true);
       window.internals.settings.setPageScaleFactor(0.5, 0, 0);
     }
-    if (window.layoutTestController)
-      layoutTestController.dumpAsText(true);
+    if (window.testRunner)
+      testRunner.dumpAsText(true);
   }
 </script>
 </head>
index bb3a5a3..bf888a6 100644 (file)
@@ -20,8 +20,8 @@
       window.internals.settings.setEnableCompositingForFixedPosition(true);
       window.internals.settings.setPageScaleFactor(2, 0, 0);
     }
-    if (window.layoutTestController)
-      layoutTestController.dumpAsText(true);
+    if (window.testRunner)
+      testRunner.dumpAsText(true);
   }
 </script>
 </head>
index 4ad6c4f..eaea299 100644 (file)
@@ -28,6 +28,6 @@
     </span>
 </div>
 <script>
-if (window.layoutTestController)
-  layoutTestController.dumpAsText();
+if (window.testRunner)
+  testRunner.dumpAsText();
 </script>
index 8d98a11..22e9458 100644 (file)
     }
   </style>
   <script>
-    if (window.layoutTestController)
-      layoutTestController.dumpAsText(true);
+    if (window.testRunner)
+      testRunner.dumpAsText(true);
     
     function dumpLayers()
     {
-      if (window.layoutTestController)
-        document.getElementById('layers').innerText = layoutTestController.layerTreeAsText();
+      if (window.testRunner)
+        document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     }
     
     window.addEventListener('load', dumpLayers, false);
index fb5e8b9..8f6923f 100644 (file)
     
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-      layoutTestController.dumpAsText(true);
+    if (window.testRunner)
+      testRunner.dumpAsText(true);
 
     function dumpLayerTree()
     {
-      if (window.layoutTestController)
-        document.getElementById('layer-tree').innerText = layoutTestController.layerTreeAsText();
+      if (window.testRunner)
+        document.getElementById('layer-tree').innerText = testRunner.layerTreeAsText();
     }
     
     window.addEventListener('load', dumpLayerTree, false);
index 32c0230..c2aca65 100644 (file)
 
   </style>
   <script>
-    if (window.layoutTestController)
-      layoutTestController.dumpAsText(true);
+    if (window.testRunner)
+      testRunner.dumpAsText(true);
 
     function doTest()
     {
-      if (window.layoutTestController)
-        layoutTestController.display();
+      if (window.testRunner)
+        testRunner.display();
 
       document.getElementById("stretch").style.left = "-100px";
     }
index 7468188..d119b09 100644 (file)
@@ -2,8 +2,8 @@
 <head>
     <title>Horizontal scroll test for composited elements</title>
     <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-        layoutTestController.waitUntilDone();
+    if (window.testRunner)
+        testRunner.waitUntilDone();
     </script>
     <script src="../resources/mock_scrollbars.js"></script>
 </head>
@@ -11,8 +11,8 @@
 <div style="-webkit-transform: translatez(0); width: 1000px; height: 800px; border-style: solid; border-color: Red; border-width: 3px; background-image: url(../resources/apple.jpg); background-repeat:repeat"></div>
 <script type="text/javascript" charset="utf-8">
       window.scrollBy(300, 0);
-      if (window.layoutTestController)
-        layoutTestController.notifyDone();
+      if (window.testRunner)
+        testRunner.notifyDone();
 </script>
 </body>
 </html>
index b9da053..81ef7c5 100644 (file)
@@ -16,8 +16,8 @@
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-      layoutTestController.dumpAsText();
+    if (window.testRunner)
+      testRunner.dumpAsText();
   </script>
 </head>
 <body>
index bb6548e..e92f444 100644 (file)
     
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
     
     var text = "";
     function showTree(which)
     {
         setTimeout(function() {
-            if (window.layoutTestController) {
+            if (window.testRunner) {
                 text += "\n" + which + " dump layer tree:\n";
-                text += layoutTestController.layerTreeAsText();
+                text += testRunner.layerTreeAsText();
                 document.getElementById('layers').innerText = text;
             }
         }, 0);
@@ -63,7 +63,7 @@
 
     function doTest()
     {
-        if (window.layoutTestController)
+        if (window.testRunner)
             //document.getElementById('layers').innerText = "";
         showTree("First");
 
@@ -78,7 +78,7 @@
                 showTree("Third");
                 
                 setTimeout(function() {
-                    layoutTestController.notifyDone();
+                    testRunner.notifyDone();
                 }, 0);
             }, 100);
         }, 100);
index 607e9f4..7a5cff2 100644 (file)
     
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-      layoutTestController.waitUntilDone();
+    if (window.testRunner)
+      testRunner.waitUntilDone();
 
     function doTest()
     {
-      if (window.layoutTestController)
-        layoutTestController.notifyDone();
+      if (window.testRunner)
+        testRunner.notifyDone();
     }
 
     window.addEventListener('load', doTest, false);
index 1b1c0b3..8d6a439 100644 (file)
     
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
     
     var text = "";
     function showTree(which)
     {
         setTimeout(function() {
-            if (window.layoutTestController) {
+            if (window.testRunner) {
                 text += "\n" + which + " dump layer tree:\n";
-                text += layoutTestController.layerTreeAsText();
+                text += testRunner.layerTreeAsText();
                 document.getElementById('layers').innerText = text;
             }
         }, 0);
@@ -44,7 +44,7 @@
 
     function doTest()
     {
-        if (window.layoutTestController)
+        if (window.testRunner)
             //document.getElementById('layers').innerText = "";
         showTree("First");
             
@@ -59,7 +59,7 @@
                 showTree("Third");
                 
                 setTimeout(function() {
-                    layoutTestController.notifyDone();
+                    testRunner.notifyDone();
                 }, 0);
             }, 100);
         }, 100);
index e7d23c1..1513865 100644 (file)
     
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-      layoutTestController.waitUntilDone();
+    if (window.testRunner)
+      testRunner.waitUntilDone();
 
     function doTest()
     {
-      if (window.layoutTestController)
-        layoutTestController.notifyDone();
+      if (window.testRunner)
+        testRunner.notifyDone();
     }
 
     window.addEventListener('load', doTest, false);
index 29ce389..c7afafe 100644 (file)
@@ -46,9 +46,9 @@
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText();
-      layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+      testRunner.dumpAsText();
+      testRunner.waitUntilDone();
     }
 
     function doTest()
@@ -57,9 +57,9 @@
       for (var i = 0; i < scrollables.length; ++i)
         scrollables[i].scrollTop = 100;
 
-      if (window.layoutTestController) {
-        document.getElementById('layers').innerText = layoutTestController.layerTreeAsText();
-        layoutTestController.notifyDone();
+      if (window.testRunner) {
+        document.getElementById('layers').innerText = testRunner.layerTreeAsText();
+        testRunner.notifyDone();
       }
     }
 
index 5454160..18a9f2c 100644 (file)
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText();
-      layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+      testRunner.dumpAsText();
+      testRunner.waitUntilDone();
     }
 
     function doTest()
     {
       window.scrollBy(0, 100);
 
-      if (window.layoutTestController) {
-        document.getElementById('layers').innerText = layoutTestController.layerTreeAsText();
-        layoutTestController.notifyDone();
+      if (window.testRunner) {
+        document.getElementById('layers').innerText = testRunner.layerTreeAsText();
+        testRunner.notifyDone();
       }
     }
 
index ffe842d..e0c09ae 100644 (file)
@@ -17,9 +17,9 @@
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-      layoutTestController.waitUntilDone();
-      layoutTestController.dumpAsText();
+    if (window.testRunner) {
+      testRunner.waitUntilDone();
+      testRunner.dumpAsText();
     }
 
     function startFade()
@@ -33,9 +33,9 @@
     
     function fadeDone()
     {
-      if (window.layoutTestController) {
-        document.getElementById('layers').innerText = layoutTestController.layerTreeAsText();
-        layoutTestController.notifyDone();
+      if (window.testRunner) {
+        document.getElementById('layers').innerText = testRunner.layerTreeAsText();
+        testRunner.notifyDone();
       }
     }
   </script>
index 9443f35..c8bc79a 100644 (file)
@@ -39,8 +39,8 @@
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-      layoutTestController.waitUntilDone();
+    if (window.testRunner)
+      testRunner.waitUntilDone();
 
     function doTest()
     {
@@ -49,8 +49,8 @@
         for (var i = 0; i < scrollables.length; ++i)
           scrollables[i].scrollTop = 500;
 
-        if (window.layoutTestController)
-          layoutTestController.notifyDone();
+        if (window.testRunner)
+          testRunner.notifyDone();
 
       }, 0);
     }
index 7f8a6b1..4e3edf8 100644 (file)
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText();
-      layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+      testRunner.dumpAsText();
+      testRunner.waitUntilDone();
     }
 
     function doTest()
     {
-      if (window.layoutTestController) {
-        document.getElementById('layers').innerText = layoutTestController.layerTreeAsText();
-        layoutTestController.notifyDone();
+      if (window.testRunner) {
+        document.getElementById('layers').innerText = testRunner.layerTreeAsText();
+        testRunner.notifyDone();
       }
     }
 
index 397fd7e..a5b9a8e 100644 (file)
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText();
-      layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+      testRunner.dumpAsText();
+      testRunner.waitUntilDone();
     }
 
     function doTest()
     {
       document.getElementById('far-left').className = 'moved';
-      if (window.layoutTestController) {
-        document.getElementById('layers').innerText = layoutTestController.layerTreeAsText();
-        layoutTestController.notifyDone();
+      if (window.testRunner) {
+        document.getElementById('layers').innerText = testRunner.layerTreeAsText();
+        testRunner.notifyDone();
       }
     }
 
index 1d57435..e725196 100644 (file)
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText();
-      layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+      testRunner.dumpAsText();
+      testRunner.waitUntilDone();
     }
 
     function doTest()
     {
-      if (window.layoutTestController) {
-        document.getElementById('layers').innerText = layoutTestController.layerTreeAsText();
-        layoutTestController.notifyDone();
+      if (window.testRunner) {
+        document.getElementById('layers').innerText = testRunner.layerTreeAsText();
+        testRunner.notifyDone();
       }
     }
 
index 74fd5c1..cf43aab 100644 (file)
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText();
-      layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+      testRunner.dumpAsText();
+      testRunner.waitUntilDone();
     }
 
     function doTest()
     {
-      if (window.layoutTestController) {
+      if (window.testRunner) {
         // We need to call display() here to sync the compositor state and avoid a race condition.
-        layoutTestController.display();
-        document.getElementById('layers').innerText = layoutTestController.layerTreeAsText();
-        layoutTestController.notifyDone();
+        testRunner.display();
+        document.getElementById('layers').innerText = testRunner.layerTreeAsText();
+        testRunner.notifyDone();
       }
     }
 
index 2e02b04..75cd2d2 100644 (file)
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText();
-      layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+      testRunner.dumpAsText();
+      testRunner.waitUntilDone();
     }
 
     function doTest()
     {
-      if (window.layoutTestController) {
-        document.getElementById('layers').innerText = layoutTestController.layerTreeAsText();
-        layoutTestController.notifyDone();
+      if (window.testRunner) {
+        document.getElementById('layers').innerText = testRunner.layerTreeAsText();
+        testRunner.notifyDone();
       }
     }
 
index 4e39e13..9999534 100644 (file)
@@ -22,8 +22,8 @@
     
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-      layoutTestController.dumpAsText();
+    if (window.testRunner)
+      testRunner.dumpAsText();
   </script>
 </head>
 <body>
index 985d3c6..1b06757 100644 (file)
     
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-      layoutTestController.waitUntilDone();
+    if (window.testRunner)
+      testRunner.waitUntilDone();
     
     function test()
     {
       window.setTimeout(function() {
         document.getElementById('tester').style.outline = '5px solid green';
-        if (window.layoutTestController)
-          layoutTestController.notifyDone();
+        if (window.testRunner)
+          testRunner.notifyDone();
       }, 0);
     }
     window.addEventListener('load', test, false);
index c7df881..eb32624 100644 (file)
   }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-      layoutTestController.waitUntilDone();
+    if (window.testRunner)
+      testRunner.waitUntilDone();
 
     function startProgram()
     {
       var panel = document.getElementById("panel");
       panel.addEventListener('webkitTransitionEnd', function() {
-        if (window.layoutTestController)
-          layoutTestController.notifyDone();
+        if (window.testRunner)
+          testRunner.notifyDone();
       }, false);
       panel.style.left = "0";
     }
@@ -68,4 +68,4 @@
   </div>
 
 </body>
-</html>
\ No newline at end of file
+</html>
index 21109b2..1474829 100644 (file)
@@ -46,9 +46,9 @@
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText();
-      layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+      testRunner.dumpAsText();
+      testRunner.waitUntilDone();
     }
     
     timeout = 100;
             document.getElementById("parent").style.webkitTransformStyle = "flat";
             setTimeout(function() {
                 document.getElementById("parent").style.webkitTransformStyle = "preserve-3d";
-                if (window.layoutTestController) {
-                    if (layoutTestController.layerTreeAsText) {
-                        var layerTree = layoutTestController.layerTreeAsText();
+                if (window.testRunner) {
+                    if (testRunner.layerTreeAsText) {
+                        var layerTree = testRunner.layerTreeAsText();
                         document.getElementById("layerTree").innerHTML = "<pre>" + layerTree + "</pre>";
                     }
-                    layoutTestController.notifyDone();
+                    testRunner.notifyDone();
                 }
             }, timeout);
         }, timeout);
index 2e5c676..7f4ad4a 100644 (file)
@@ -61,9 +61,9 @@
     
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText(true);
-      layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+      testRunner.dumpAsText(true);
+      testRunner.waitUntilDone();
     }
 
     function repaint()
@@ -74,8 +74,8 @@
         currImage.style.backgroundColor = 'orange';
       }
 
-      if (window.layoutTestController)
-        layoutTestController.notifyDone();
+      if (window.testRunner)
+        testRunner.notifyDone();
     }
     
     window.addEventListener('load', function() {
index fc61f41..6c13643 100644 (file)
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-  if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+  if (window.testRunner)
+    testRunner.waitUntilDone();
 
   function startTest()
   {
     window.setTimeout(function() {
       document.documentElement.style.width = '800px'
       window.setTimeout(function() {
-        if (window.layoutTestController)
-          layoutTestController.notifyDone();
+        if (window.testRunner)
+          testRunner.notifyDone();
       }, 0);
     }, 0);
   }
index 8fdf043..d4365a8 100644 (file)
@@ -19,8 +19,8 @@ body {
 }
 </style>
 <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText(true);
+    if (window.testRunner)
+        testRunner.dumpAsText(true);
 </script>
 </head>
 <body>
@@ -29,4 +29,4 @@ body {
     <div id="wrapper"></div>
     <div class="accelerated"></div>
 </body>
-</html>
\ No newline at end of file
+</html>
index ce2f91d..03b09d5 100644 (file)
@@ -2,8 +2,8 @@
 <head>
     <title>Vertical scroll test for composited elements</title>
     <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-        layoutTestController.waitUntilDone();
+    if (window.testRunner)
+        testRunner.waitUntilDone();
     </script>
     <script src="../resources/mock_scrollbars.js"></script>
 </head>
@@ -11,8 +11,8 @@
 <div style="-webkit-transform: rotate3d(0,0,1,20deg); width: 800px; height: 1000px; border-style: solid; border-color: Red; border-width: 3px; background-image: url(../resources/apple.jpg); background-repeat:repeat"></div>
 <script type="text/javascript" charset="utf-8">
       window.scrollBy(0, 200);
-      if (window.layoutTestController)
-        layoutTestController.notifyDone();
+      if (window.testRunner)
+        testRunner.notifyDone();
 </script>
 </body>
 </html>
index 3ce3968..6af99b6 100644 (file)
@@ -29,8 +29,8 @@
   <script type="text/javascript" charset="utf-8">
     function testDone()
     {
-      if (window.layoutTestController)
-        layoutTestController.notifyDone();
+      if (window.testRunner)
+        testRunner.notifyDone();
     }
 
     function modifyDocument()
index 0063977..ee1cb2d 100644 (file)
@@ -35,8 +35,8 @@
   <script type="text/javascript" charset="utf-8">
     function testDone()
     {
-      if (window.layoutTestController)
-        layoutTestController.notifyDone();
+      if (window.testRunner)
+        testRunner.notifyDone();
     }
 
     function doTest()
index 39f7600..2768368 100644 (file)
@@ -26,9 +26,9 @@
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     function doTest()
         // For some reason this delay is required for AppKit to not short-circuit the display.
         window.setTimeout(function() {
           document.getElementById('box').className = 'composited';
-          if (window.layoutTestController) {
-              layoutTestController.display();
-              document.getElementById('layers').innerHTML = layoutTestController.layerTreeAsText();
-              layoutTestController.notifyDone();
+          if (window.testRunner) {
+              testRunner.display();
+              document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
+              testRunner.notifyDone();
           }
         }, 20);
     }
index 2efdebe..f487607 100644 (file)
@@ -26,9 +26,9 @@
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     function doTest()
         // Need to wait for compositing layers to be updated.
         window.setTimeout(function() {
           document.getElementById('overlay').style.height = '150px';
-            if (window.layoutTestController) {
-                layoutTestController.display(); // Painting has to happen to detect overlap.
-                document.getElementById('layers').innerHTML = layoutTestController.layerTreeAsText();
-                layoutTestController.notifyDone();
+            if (window.testRunner) {
+                testRunner.display(); // Painting has to happen to detect overlap.
+                document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
+                testRunner.notifyDone();
             }
         }, 0);
     }
index 76e7b96..042e3ba 100644 (file)
@@ -33,8 +33,8 @@
   </style>
   <script type="text/javascript" charset="utf-8">
     
-    if (window.layoutTestController)
-      layoutTestController.waitUntilDone();
+    if (window.testRunner)
+      testRunner.waitUntilDone();
 
     function doTest()
     {
@@ -42,8 +42,8 @@
         var iframe = document.getElementsByTagName('iframe')[0];
         iframe.contentWindow.scrollTo(0, 200);
 
-        if (window.layoutTestController)
-          layoutTestController.notifyDone();
+        if (window.testRunner)
+          testRunner.notifyDone();
       }, 0)
     }
     
index 3ad35a0..da6196c 100644 (file)
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     function doTest()
     {
-        if (window.layoutTestController) {
-            document.getElementById('layers').innerHTML = layoutTestController.layerTreeAsText();
-            layoutTestController.notifyDone();
+        if (window.testRunner) {
+            document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
+            testRunner.notifyDone();
         }
     }
 
index d8a1911..e57db00 100644 (file)
     
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     function doTest()
     {
-        if (window.layoutTestController)
-            layoutTestController.display();
+        if (window.testRunner)
+            testRunner.display();
 
         document.getElementById('box').className = 'composited';
-        if (window.layoutTestController) {
+        if (window.testRunner) {
           document.getElementById('iframe').contentDocument.body.offsetWidth; // update iframe layout
-          document.getElementById('layers').innerText = layoutTestController.layerTreeAsText();
-          layoutTestController.notifyDone();
+          document.getElementById('layers').innerText = testRunner.layerTreeAsText();
+          testRunner.notifyDone();
         }
     }
     
index 2cfd6eb..283f128 100644 (file)
@@ -24,9 +24,9 @@
     
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     // Called from subframe.
     {
       document.getElementById('parent-iframe').contentDocument.body.offsetWidth; // work around bug 41999.
 
-      if (window.layoutTestController)
-        layoutTestController.display();
+      if (window.testRunner)
+        testRunner.display();
 
-      if (window.layoutTestController) {
-        document.getElementById('layers').innerText = layoutTestController.layerTreeAsText();
-        layoutTestController.notifyDone();
+      if (window.testRunner) {
+        document.getElementById('layers').innerText = testRunner.layerTreeAsText();
+        testRunner.notifyDone();
       }
     }
   </script>
index 00aa108..02352e5 100644 (file)
     
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     function doTest()
     {
-        if (window.layoutTestController)
-            layoutTestController.display();
+        if (window.testRunner)
+            testRunner.display();
 
       document.getElementById('iframe').className = 'composited';
 
-      if (window.layoutTestController) {
-        document.getElementById('layers').innerText = layoutTestController.layerTreeAsText();
-        layoutTestController.notifyDone();
+      if (window.testRunner) {
+        document.getElementById('layers').innerText = testRunner.layerTreeAsText();
+        testRunner.notifyDone();
       }
     }
     
index 21f1810..8445556 100644 (file)
     
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     function doTest()
     {
-      if (window.layoutTestController)
-        layoutTestController.display();
+      if (window.testRunner)
+        testRunner.display();
 
       document.getElementById('iframe').className = 'composited';
 
-      if (window.layoutTestController) {
-        document.getElementById('layers').innerText = layoutTestController.layerTreeAsText();
-        layoutTestController.notifyDone();
+      if (window.testRunner) {
+        document.getElementById('layers').innerText = testRunner.layerTreeAsText();
+        testRunner.notifyDone();
       }
     }
     
index 901b7f3..d898f55 100644 (file)
     
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     // Called from subframe.
     function testDone()
     {
       document.getElementById('parent-iframe').contentDocument.body.offsetWidth; // work around bug 41999.
-      if (window.layoutTestController) {
-        layoutTestController.display();
-        document.getElementById('layers').innerText = layoutTestController.layerTreeAsText();
-        layoutTestController.notifyDone();
+      if (window.testRunner) {
+        testRunner.display();
+        document.getElementById('layers').innerText = testRunner.layerTreeAsText();
+        testRunner.notifyDone();
       }
     }
   </script>
index 07f1b4a..c06b47e 100644 (file)
@@ -18,8 +18,8 @@
   <script type="text/javascript" charset="utf-8">
     function doTest()
     {
-      if (window.layoutTestController)
-        layoutTestController.display();
+      if (window.testRunner)
+        testRunner.display();
 
       document.getElementById('iframe').className = 'composited';
     }
index 4e832e1..7991172 100644 (file)
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-        layoutTestController.waitUntilDone();
+    if (window.testRunner)
+        testRunner.waitUntilDone();
 
         function doTest()
         {
             // Need to wait for compositing layers to be updated.
             window.setTimeout(function() {
                 document.getElementById('iframe').contentWindow.scrollTo(0, 120);
-                if (window.layoutTestController)
-                    layoutTestController.notifyDone();
+                if (window.testRunner)
+                    testRunner.notifyDone();
             }, 0);
         }
 
index 7305afa..d720075 100644 (file)
     "></iframe>
 </div>
 <script>
-    if (window.layoutTestController)
-        layoutTestController.waitUntilDone();
+    if (window.testRunner)
+        testRunner.waitUntilDone();
 
     setTimeout(function() {
         document.getElementById("frame").contentWindow.scrollTo(600, 600);
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }, 200);
 </script>
index 241d8da..c00fb63 100644 (file)
     
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     function doTest()
     {
         // For some reason this delay is required for AppKit to not short-circuit the display.
         window.setTimeout(function() {
-          if (window.layoutTestController)
-            layoutTestController.display();
+          if (window.testRunner)
+            testRunner.display();
 
             document.getElementById('parent-iframe').className = 'bigger';
-            if (window.layoutTestController) {
-                layoutTestController.display();
-                document.getElementById('layers').innerHTML = layoutTestController.layerTreeAsText();
-                layoutTestController.notifyDone();
+            if (window.testRunner) {
+                testRunner.display();
+                document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
+                testRunner.notifyDone();
             }
         }, 0);
     }
index 1938771..15f15ea 100644 (file)
@@ -26,9 +26,9 @@
     
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     function doTest()
@@ -37,9 +37,9 @@
             document.getElementById('iframe').className = 'expanded';
             // Need to wait for compositing layers to be updated.
             window.setTimeout(function() {
-                if (window.layoutTestController) {
-                    document.getElementById('layers').innerHTML = layoutTestController.layerTreeAsText();
-                    layoutTestController.notifyDone();
+                if (window.testRunner) {
+                    document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
+                    testRunner.notifyDone();
                 }
             }, 0);
         }, 0);
index f68ca81..dcfd2d8 100644 (file)
     
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     function doTest()
     {
         // For some reason this delay is required for AppKit to not short-circuit the display.
         window.setTimeout(function() {
-            if (window.layoutTestController)
-                layoutTestController.display();
+            if (window.testRunner)
+                testRunner.display();
 
             var hadLayers = false;
-            if (window.layoutTestController) {
-                var layers = layoutTestController.layerTreeAsText();
+            if (window.testRunner) {
+                var layers = testRunner.layerTreeAsText();
                 hadLayers = layers != "";
             }
 
             document.getElementById('iframe').className = 'collapsed';
 
-            if (window.layoutTestController) {
+            if (window.testRunner) {
 
-                layoutTestController.display();
-                var haveLayers = layoutTestController.layerTreeAsText() != "";
+                testRunner.display();
+                var haveLayers = testRunner.layerTreeAsText() != "";
                 var result;
                 if (hadLayers && !haveLayers)
                   result = "PASS: had layers, and now do not";
                 else
                   result = "FAIL: layers should have gone. hadLayers = " + hadLayers + ", haveLayers = " + haveLayers;
                 document.getElementById('result').innerHTML = result;
-                layoutTestController.notifyDone();
+                testRunner.notifyDone();
             }
         }, 0);
     }
index 47a2640..e019285 100644 (file)
@@ -23,9 +23,9 @@
     
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     function doTest()
         window.setTimeout(function() {
             var hadLayersBefore = false;
             var hadLayersAfter = false;
-            if (window.layoutTestController) {
-                layoutTestController.display(); // Need to paint for overlap testing.
-                hadLayersBefore = layoutTestController.layerTreeAsText() != "";
+            if (window.testRunner) {
+                testRunner.display(); // Need to paint for overlap testing.
+                hadLayersBefore = testRunner.layerTreeAsText() != "";
             }
 
             document.getElementById('parent-iframe').src = "about:blank";
             
             window.setTimeout(function() {
-                if (window.layoutTestController) {
-                    hadLayersAfter = layoutTestController.layerTreeAsText() != "";
+                if (window.testRunner) {
+                    hadLayersAfter = testRunner.layerTreeAsText() != "";
 
                     var results = document.getElementById('results');
                     if (hadLayersBefore && !hadLayersAfter)
@@ -53,7 +53,7 @@
                     else if (hadLayersAfter)
                         results.innerText = "FAIL: layers did not disappear when iframe source changed."
 
-                    layoutTestController.notifyDone();
+                    testRunner.notifyDone();
                 }
             }, 0);
         }, 0);
index af9b68f..c048769 100644 (file)
@@ -25,9 +25,9 @@
   </style>
   <script type="text/javascript" charset="utf-8">
     
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText();
-      layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+      testRunner.dumpAsText();
+      testRunner.waitUntilDone();
     }
 
     function doTest()
       window.setTimeout(function() {
         var div = document.getElementById('invisible');
         div.style.cssText = "display:none;";
-        if (window.layoutTestController) {
-          layoutTestController.display();
-          document.getElementById('layers').innerHTML = layoutTestController.layerTreeAsText();
-          layoutTestController.notifyDone();
+        if (window.testRunner) {
+          testRunner.display();
+          document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
+          testRunner.notifyDone();
         }
       }, 0)
     }
index 467fd29..adb9b1b 100644 (file)
@@ -25,9 +25,9 @@
   </style>
   <script type="text/javascript" charset="utf-8">
     
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText();
-      layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+      testRunner.dumpAsText();
+      testRunner.waitUntilDone();
     }
 
     function doTest()
       window.setTimeout(function() {
         var div = document.getElementById('invisible');
         div.style.cssText = "";
-        if (window.layoutTestController) {
-          layoutTestController.display();
-          document.getElementById('layers').innerHTML = layoutTestController.layerTreeAsText();
-          layoutTestController.notifyDone();
+        if (window.testRunner) {
+          testRunner.display();
+          document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
+          testRunner.notifyDone();
         }
       }, 0)
     }
index 6fc7949..04f99f0 100644 (file)
@@ -43,9 +43,9 @@
     }
   </style>
   <script type="text/javascript">
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     // Called from subframe.
@@ -57,8 +57,8 @@
             eventSender.mouseUp();
         }
 
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
     
     function nodeClicked(node)
index 264cedc..0347fe0 100644 (file)
     
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     // Called from subframe.
     function testDone()
     {
       document.getElementById('parent-iframe').contentDocument.body.offsetWidth; // work around bug 41999.
-      if (window.layoutTestController)
-        layoutTestController.display();
+      if (window.testRunner)
+        testRunner.display();
 
-      if (window.layoutTestController) {
-        document.getElementById('layers').innerText = layoutTestController.layerTreeAsText();
-        layoutTestController.notifyDone();
+      if (window.testRunner) {
+        document.getElementById('layers').innerText = testRunner.layerTreeAsText();
+        testRunner.notifyDone();
       }
     }
   </script>
index 3bcde97..82e78b4 100644 (file)
@@ -19,8 +19,8 @@
         var iframe = document.getElementsByTagName("iframe")[0];
         iframe.contentWindow.scrollTo(0, 250);
       }
-      if (window.layoutTestController)
-        layoutTestController.dumpAsText(true);
+      if (window.testRunner)
+        testRunner.dumpAsText(true);
       window.addEventListener("load", runTest, false);
     </script>
   </head>
index 941a232..b803e68 100644 (file)
@@ -22,8 +22,8 @@
   </style>
   <script type="text/javascript" charset="utf-8">
     
-    if (window.layoutTestController)
-        layoutTestController.waitUntilDone();
+    if (window.testRunner)
+        testRunner.waitUntilDone();
 
     function runTest()
     {
@@ -31,8 +31,8 @@
         var subframeWindow = frameDocument.getElementById('subframe').contentWindow;
         subframeWindow.scrollTo(0, 100);
 
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
     
     window.addEventListener('load', function() {
index 1d2d392..e184980 100644 (file)
@@ -24,9 +24,9 @@
     }
   </style>
   <script>
-    if (window.layoutTestController) {
-        layoutTestController.waitUntilDone();
-        layoutTestController.dumpAsText();
+    if (window.testRunner) {
+        testRunner.waitUntilDone();
+        testRunner.dumpAsText();
     }
 
     function doTest()
         // For some reason this delay is required for AppKit to not short-circuit the display which is required
         // for overlap testing to kick in.
         window.setTimeout(function() {
-            if (window.layoutTestController) {
-                layoutTestController.display();
-                document.getElementById('layers').innerHTML = layoutTestController.layerTreeAsText();
-                layoutTestController.notifyDone();
+            if (window.testRunner) {
+                testRunner.display();
+                document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
+                testRunner.notifyDone();
             }
         }, 0);
     }
index dbce45f..dd07617 100644 (file)
     
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     function doTest()
     {
         // For some reason this delay is required for AppKit to not short-circuit the display.
         window.setTimeout(function() {
-          if (window.layoutTestController) {
-              layoutTestController.display();
-              document.getElementById('layers').innerHTML = layoutTestController.layerTreeAsText();
-              layoutTestController.notifyDone();
+          if (window.testRunner) {
+              testRunner.display();
+              document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
+              testRunner.notifyDone();
           }
         }, 0);
     }
index 50406ec..de03342 100644 (file)
@@ -22,9 +22,9 @@
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     function doTest()
         window.setTimeout(function() {
           window.scrollTo(0, 100);
           // Force a paint, and give layers a chance to update.
-          if (window.layoutTestController)
-            layoutTestController.display();
+          if (window.testRunner)
+            testRunner.display();
           window.setTimeout(function() {
-            if (window.layoutTestController) {
-                document.getElementById('layers').innerHTML = layoutTestController.layerTreeAsText();
-                layoutTestController.notifyDone();
+            if (window.testRunner) {
+                document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
+                testRunner.notifyDone();
             }
           }, 0);
         }, 0);
index 2f5e8f5..5cfe091 100644 (file)
     <pre id="output"></pre>
 
     <script>
-    if (window.layoutTestController) {
-        window.layoutTestController.dumpAsText();
-        window.layoutTestController.waitUntilDone();
-        window.layoutTestController.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
+    if (window.testRunner) {
+        window.testRunner.dumpAsText();
+        window.testRunner.waitUntilDone();
+        window.testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
     }
 
     function finishTest() {
         var output = document.getElementById("output");
-        output.innerText = layoutTestController.layerTreeAsText();
+        output.innerText = testRunner.layerTreeAsText();
 
-        if (window.layoutTestController)
-            window.layoutTestController.notifyDone();        
+        if (window.testRunner)
+            window.testRunner.notifyDone();        
     }
 
     window.addEventListener("pageshow", function(event) {
index 7d83299..129760a 100644 (file)
@@ -23,8 +23,8 @@
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-      layoutTestController.dumpAsText();
+    if (window.testRunner)
+      testRunner.dumpAsText();
 
     function doTest()
     {
index 45b4ae5..745d856 100644 (file)
@@ -33,9 +33,9 @@ function test() {
     document.getElementById("horizontal").contentDocument.body.classList.add("wide"); // middle iframe starts with a horizontal scrollbar
     document.getElementById("both").contentDocument.body.classList.add("wide"); // bottom iframe starts with both
     document.getElementById("both").contentDocument.body.classList.add("tall"); // vertical and horizontal scrollbars
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText(true);
-        layoutTestController.display(); // Paint once with all overflow controls visible.
+    if (window.testRunner) {
+        testRunner.dumpAsText(true);
+        testRunner.display(); // Paint once with all overflow controls visible.
         finishTest();
     } else
         window.setTimeout(finishTest, 5000);
index 3f41186..e97466e 100644 (file)
@@ -7,9 +7,9 @@
 </style>
 <script>
 function test() {
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        document.getElementById('layers').innerHTML = layoutTestController.layerTreeAsText();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
     }
 }
 </script>
index 6f88e6d..187f48c 100644 (file)
 </head>
 <script>
     function doTest() {
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText(true);
+        if (window.testRunner)
+            testRunner.dumpAsText(true);
         window.scrollTo(0, 2000);
-        if (window.layoutTestController)
-            layoutTestController.display();
+        if (window.testRunner)
+            testRunner.display();
         window.scrollTo(0, 1800);
     }
     window.addEventListener("load", doTest, false);
index 2d0ee50..ba667f2 100644 (file)
     }
   </style>
   <script>
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText(true);
+    if (window.testRunner) {
+      testRunner.dumpAsText(true);
     }
 
     function doTest()
     {
-      if (window.layoutTestController)
-        layoutTestController.display();
+      if (window.testRunner)
+        testRunner.display();
 
       // Any scroll should keep the fixed-position element where it is.
       // If it stutters or disappears incorrectly, then the red background will be revealed.
index b0c103b..84ca34f 100644 (file)
   <script>
     if (window.internals)
       window.internals.settings.setMockScrollbarsEnabled(true);
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText(true);
-      layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+      testRunner.dumpAsText(true);
+      testRunner.waitUntilDone();
     }
 
     function doTest()
     {
-      if (window.layoutTestController)
-        layoutTestController.display();
+      if (window.testRunner)
+        testRunner.display();
       // Scroll red box off screen and scroll green box into same place.
       window.scrollTo(0, 400);
-      if (window.layoutTestController)
-        layoutTestController.notifyDone();
+      if (window.testRunner)
+        testRunner.notifyDone();
     }
 
     window.addEventListener('load', doTest, false);
index b291242..11c87da 100644 (file)
     
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     function doTest()
     {
         // For some reason this delay is required for AppKit to not short-circuit the display.
         window.setTimeout(function() {
-            if (window.layoutTestController)
-                layoutTestController.display();
+            if (window.testRunner)
+                testRunner.display();
 
             document.getElementById('parent-iframe').contentWindow.scrollTo(80, 80);
-            if (window.layoutTestController) {
-                document.getElementById('layers').innerHTML = layoutTestController.layerTreeAsText();
-                layoutTestController.notifyDone();
+            if (window.testRunner) {
+                document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
+                testRunner.notifyDone();
             }
         }, 0);
     }
index 119ff4e..d73e8c7 100644 (file)
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText();
-      layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+      testRunner.dumpAsText();
+      testRunner.waitUntilDone();
     }
       
     function doTest() {
-      if (window.layoutTestController) {
-        document.getElementById('layers').innerText = layoutTestController.layerTreeAsText();
-        layoutTestController.notifyDone();
+      if (window.testRunner) {
+        document.getElementById('layers').innerText = testRunner.layerTreeAsText();
+        testRunner.notifyDone();
       }
     }
     window.addEventListener('load', doTest, false);
index 9c796e7..827eb4e 100644 (file)
@@ -11,9 +11,9 @@
     }
 </style>
 <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-        layoutTestController.waitUntilDone();
-        layoutTestController.dumpAsText(true);
+    if (window.testRunner) {
+        testRunner.waitUntilDone();
+        testRunner.dumpAsText(true);
     }
     function doTest()
     {
@@ -22,9 +22,9 @@
         window.setTimeout(function() {
             // Change the contents to green.
             image.src =  "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAADElEQVR4nGNg+M8AAAICAQB7CYF4AAAAAElFTkSuQmCC"
-            if (window.layoutTestController) {
+            if (window.testRunner) {
                 window.setTimeout(function() {
-                    layoutTestController.notifyDone();
+                    testRunner.notifyDone();
                 }, 0);
             }
         }, 0);
index 20f6d98..a86e2ff 100644 (file)
@@ -8,8 +8,8 @@
         }
     </style>
     <script type="text/javascript" charset="utf-8">
-        if (window.layoutTestController)
-            layoutTestController.dumpAsText();
+        if (window.testRunner)
+            testRunner.dumpAsText();
     </script>
 </head>
 <body>
index bcb6678..5e77303 100644 (file)
@@ -28,9 +28,9 @@
 <script>
     function doTest() {
         window.scrollTo(0, 1000);
-        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);
index 6525ca3..7a1c916 100644 (file)
     if (window.internals)
       window.internals.settings.setEnableCompositingForFixedPosition(true);
 
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText();
+    if (window.testRunner) {
+      testRunner.dumpAsText();
 
       window.addEventListener("load", function() {
-        document.getElementById("layertree").innerText = layoutTestController.layerTreeAsText();
+        document.getElementById("layertree").innerText = testRunner.layerTreeAsText();
       }, false);
     }
   </script>
index a1c8b2a..6d2aded 100644 (file)
     </style>
     <script src="../../fast/repaint/resources/repaint.js"></script>
     <script type="text/javascript" charset="utf-8">
-      if (window.layoutTestController) {
-        layoutTestController.dumpAsText(true);
-        layoutTestController.waitUntilDone();
+      if (window.testRunner) {
+        testRunner.dumpAsText(true);
+        testRunner.waitUntilDone();
       }
 
       function repaintTest()
       {
         window.scrollBy(0,-96);
-        if (window.layoutTestController)
-          layoutTestController.notifyDone();
+        if (window.testRunner)
+          testRunner.notifyDone();
       }
 
       function doTest()
index 8361010..9335e70 100644 (file)
@@ -34,9 +34,9 @@
 <script>
     function doTest() {
         window.scrollTo(0, 1000);
-        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);
index 64cf496..ae0648a 100644 (file)
   </style>
 
   <script>
-  if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+  if (window.testRunner)
+    testRunner.dumpAsText();
     
   function dumpLayers()
   {
     var layersResult = document.getElementById('layers');
-    if (window.layoutTestController)
-      layersResult.innerText = layoutTestController.layerTreeAsText();
+    if (window.testRunner)
+      layersResult.innerText = testRunner.layerTreeAsText();
     
   }
   window.addEventListener('load', dumpLayers, false)
index 89b89db..a04dc57 100644 (file)
@@ -36,9 +36,9 @@
   </style>
   <script type="text/javascript" charset="utf-8">
     
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText();
-      layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+      testRunner.dumpAsText();
+      testRunner.waitUntilDone();
     }
 
     function doTest()
@@ -48,9 +48,9 @@
         scrollDiv.scrollTop = 200;
 
         
-        if (window.layoutTestController) {
-          document.getElementById('results').innerText = window.layoutTestController.layerTreeAsText();
-          layoutTestController.notifyDone();
+        if (window.testRunner) {
+          document.getElementById('results').innerText = window.testRunner.layerTreeAsText();
+          testRunner.notifyDone();
         }
       }, 150);
     }
index e7ac076..671e002 100644 (file)
@@ -30,9 +30,9 @@
     }
   </style>
   <script>
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText();
-      layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+      testRunner.dumpAsText();
+      testRunner.waitUntilDone();
     }
       
     function runTest()
@@ -44,9 +44,9 @@
     
     function animationStarted()
     {
-      if (window.layoutTestController) {
-        document.getElementById('layers').innerText = layoutTestController.layerTreeAsText();
-        layoutTestController.notifyDone();
+      if (window.testRunner) {
+        document.getElementById('layers').innerText = testRunner.layerTreeAsText();
+        testRunner.notifyDone();
       }
     }
     window.addEventListener('load', runTest, false);
index e707cc0..c87dda1 100644 (file)
 </style>
 
 <script>
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText(true);
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText(true);
+        testRunner.waitUntilDone();
     }
 
     window.addEventListener('load', function() {
-        if (window.layoutTestController) {
-            document.getElementById("layertree").innerText = layoutTestController.layerTreeAsText();
-            layoutTestController.notifyDone();
+        if (window.testRunner) {
+            document.getElementById("layertree").innerText = testRunner.layerTreeAsText();
+            testRunner.notifyDone();
         }
     }, false);
 </script>
index eaa6fd5..7888d7d 100644 (file)
     }
 </style>
 <script>
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText(false);
+    if (window.testRunner) {
+        testRunner.dumpAsText(false);
         window.addEventListener('load', function() {
-            document.getElementById("layertree").innerText = layoutTestController.layerTreeAsText();
+            document.getElementById("layertree").innerText = testRunner.layerTreeAsText();
         }, false);
     }
 </script>
index 3c2b66e..792f411 100644 (file)
 </style>
 
 <script>
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText(true);
+    if (window.testRunner) {
+        testRunner.dumpAsText(true);
         window.addEventListener('load', function() {
-            document.getElementById("layertree").innerText = layoutTestController.layerTreeAsText();
+            document.getElementById("layertree").innerText = testRunner.layerTreeAsText();
         }, false);
     }
 </script>
index dabbae3..042576b 100644 (file)
 </style>
 
 <script>
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText(true);
+    if (window.testRunner) {
+        testRunner.dumpAsText(true);
         window.addEventListener('load', function() {
-            document.getElementById("layertree").innerText = layoutTestController.layerTreeAsText();
+            document.getElementById("layertree").innerText = testRunner.layerTreeAsText();
         }, false);
     }
 </script>
index b6d05a7..d41f838 100644 (file)
     }
   </style>
   <script>
-    if (window.layoutTestController)
-      layoutTestController.dumpAsText();
+    if (window.testRunner)
+      testRunner.dumpAsText();
       
     function testDone()
     {
-      if (window.layoutTestController)
-        document.getElementById('layers').innerText = layoutTestController.layerTreeAsText();
+      if (window.testRunner)
+        document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     }
     window.addEventListener('load', testDone, false);
   </script>
index 870b375..41e102e 100644 (file)
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-   if (window.layoutTestController)
-     layoutTestController.dumpAsText();
+   if (window.testRunner)
+     testRunner.dumpAsText();
 
    function doTest()
    {
-       if (window.layoutTestController) {
-         document.getElementById('results').innerText = window.layoutTestController.layerTreeAsText();
-         layoutTestController.notifyDone();
+       if (window.testRunner) {
+         document.getElementById('results').innerText = window.testRunner.layerTreeAsText();
+         testRunner.notifyDone();
        }
    }
    
index af995b1..76439fb 100644 (file)
       }
     </style>
     <script type="text/javascript" charset="utf-8">
-      if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+      if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
       }
 
       function doTest()
       {
         window.setTimeout(function() {
           document.getElementById('scroller').scrollTop = 50;
-          if (window.layoutTestController) {
-            document.getElementById('results').innerText = layoutTestController.layerTreeAsText();
-            layoutTestController.notifyDone();
+          if (window.testRunner) {
+            document.getElementById('results').innerText = testRunner.layerTreeAsText();
+            testRunner.notifyDone();
           }
         }, 20);
       }
index a0f44d8..cb33d0a 100644 (file)
                ctx.fillStyle = "red";
                ctx.fillRect(0,0,ctx.canvas.width,ctx.canvas.height);
                
-            if (window.layoutTestController) {
-                window.layoutTestController.dumpAsText(true);
+            if (window.testRunner) {
+                window.testRunner.dumpAsText(true);
                 var console = document.getElementById("layeroutput");
-                console.innerHTML = window.layoutTestController.layerTreeAsText();
+                console.innerHTML = window.testRunner.layerTreeAsText();
             }
            }
        </script>
index 37d0d0b..c1959dc 100644 (file)
     }
   </style>
   <script>
-      if (window.layoutTestController) {
-          layoutTestController.dumpAsText();
-          layoutTestController.waitUntilDone();
+      if (window.testRunner) {
+          testRunner.dumpAsText();
+          testRunner.waitUntilDone();
       }
 
       function doTest()
       {
-          if (window.layoutTestController) {
-              document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
-              layoutTestController.notifyDone();
+          if (window.testRunner) {
+              document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
+              testRunner.notifyDone();
           }
       }
 
index 8db1677..4ed5930 100644 (file)
     </style>
 </head>
 <script>
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     function doTest()
     {
-        if (window.layoutTestController) {
-            document.getElementById('layertree').innerText = layoutTestController.layerTreeAsText();
-            layoutTestController.notifyDone();
+        if (window.testRunner) {
+            document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
+            testRunner.notifyDone();
         }
     }
 
index 6f4e6d6..d9166d7 100644 (file)
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-   if (window.layoutTestController)
-     layoutTestController.dumpAsText();
+   if (window.testRunner)
+     testRunner.dumpAsText();
 
    function doTest()
    {
-       if (window.layoutTestController) {
-         document.getElementById('results').innerText = window.layoutTestController.layerTreeAsText();
-         layoutTestController.notifyDone();
+       if (window.testRunner) {
+         document.getElementById('results').innerText = window.testRunner.layerTreeAsText();
+         testRunner.notifyDone();
        }
    }
    
index e78008a..c03e421 100644 (file)
@@ -39,8 +39,8 @@
     <script type="text/javascript" charset="utf-8">
       function testDone()
       {
-        if (window.layoutTestController)
-          layoutTestController.notifyDone();
+        if (window.testRunner)
+          testRunner.notifyDone();
       }
       
       function modifyDocument()
index dbf51fe..efdc889 100644 (file)
@@ -28,8 +28,8 @@
     }
   </style>
   <script>
-    if (window.layoutTestController)
-      layoutTestController.dumpAsText(true);
+    if (window.testRunner)
+      testRunner.dumpAsText(true);
 
     function drawMask()
     {
index d7c326c..d307e9f 100644 (file)
@@ -11,8 +11,8 @@
     }
   </style>
   <script>
-    if (window.layoutTestController)
-      layoutTestController.dumpAsText();
+    if (window.testRunner)
+      testRunner.dumpAsText();
 
     function dumpResults()
     {
@@ -22,8 +22,8 @@
       results.innerText = window.getComputedStyle(document.getElementById('box1')).webkitTransformStyle + '\n';
       results.innerText += window.getComputedStyle(document.getElementById('box2')).webkitTransformStyle + '\n';
       
-      if (window.layoutTestController)
-        results.innerText += layoutTestController.layerTreeAsText();
+      if (window.testRunner)
+        results.innerText += testRunner.layerTreeAsText();
     }
     window.addEventListener('load', dumpResults, false);
   </script>
index cb26337..f651798 100644 (file)
@@ -57,8 +57,8 @@
 }
 </style>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText(true); // Only useful as a pixel test
+if (window.testRunner)
+    testRunner.dumpAsText(true); // Only useful as a pixel test
 </script>
 <!-- No red should be visible, only a solid green square. -->
 <div class="container composited">
index 75dc72a..c7b9574 100644 (file)
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText();
-      layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+      testRunner.dumpAsText();
+      testRunner.waitUntilDone();
     }
       
     function doTest() {
-      if (window.layoutTestController) {
-        document.getElementById('layers').innerText = layoutTestController.layerTreeAsText();
-        layoutTestController.notifyDone();
+      if (window.testRunner) {
+        document.getElementById('layers').innerText = testRunner.layerTreeAsText();
+        testRunner.notifyDone();
       }
     }
     window.addEventListener('load', doTest, false);
index ed8e00a..521c1f1 100644 (file)
@@ -48,15 +48,15 @@ function finishTest() {
     document.getElementById("both").classList.add("wide"); // third div gets both
     document.getElementById("both").classList.add("tall"); // vertical and horizontal scrollbars
     document.getElementById("corner").classList.add("resizeWidget"); // bottom div gets a resize corner but no scrollbars
-    if (window.layoutTestController) {
-        layoutTestController.display(); // Ensure compositor tree is up to date.
-        document.getElementById("layerTree").innerText = layoutTestController.layerTreeAsText();
+    if (window.testRunner) {
+        testRunner.display(); // Ensure compositor tree is up to date.
+        document.getElementById("layerTree").innerText = testRunner.layerTreeAsText();
     }
 }
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.display(); // Force compositor state to be updated before the container needs any overflow controls
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.display(); // Force compositor state to be updated before the container needs any overflow controls
     finishTest();
 } else
     window.setTimeout(finishTest, 0);
index 7e69030..f92cf47 100644 (file)
@@ -48,15 +48,15 @@ function finishTest() {
     document.getElementById("both").classList.remove("wide"); // third div loses both
     document.getElementById("both").classList.remove("tall"); // vertical and horizontal scrollbars
     document.getElementById("corner").classList.remove("resizeWidget"); // bottom div loses a resize corner but no scrollbars
-    if (window.layoutTestController) {
-        layoutTestController.display(); // Ensure compositor tree is up to date.
-        document.getElementById("layerTree").innerText = layoutTestController.layerTreeAsText();
+    if (window.testRunner) {
+        testRunner.display(); // Ensure compositor tree is up to date.
+        document.getElementById("layerTree").innerText = testRunner.layerTreeAsText();
     }
 }
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.display(); // Force compositor state to be updated before the container needs any overflow controls
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.display(); // Force compositor state to be updated before the container needs any overflow controls
     finishTest();
 } else
     window.setTimeout(finishTest, 0);
index 01cc461..60dc2d7 100644 (file)
@@ -17,8 +17,8 @@
             </div>\r
         </div>\r
         <script>\r
-            if (window.layoutTestController)\r
-                layoutTestController.dumpAsText();\r
+            if (window.testRunner)\r
+                testRunner.dumpAsText();\r
         </script>\r
     </body>\r
 </html>\r
index d57e3e0..bc7e7ac 100644 (file)
@@ -33,8 +33,8 @@
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-      layoutTestController.waitUntilDone();
+    if (window.testRunner)
+      testRunner.waitUntilDone();
   </script>
 </head>
 <body>
@@ -50,8 +50,8 @@
       var video = document.getElementsByTagName('video')[0];
       video.src = '../resources/video.' + (video.canPlayType('video/ogg') ? 'ogv' : 'mp4');
       video.addEventListener('canplaythrough', function() {
-        if (window.layoutTestController)
-          layoutTestController.notifyDone();
+        if (window.testRunner)
+          testRunner.notifyDone();
       }, false);
     </script>
     
index 9d5eb84..6fdca1c 100644 (file)
@@ -51,8 +51,8 @@
   }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-      layoutTestController.waitUntilDone();
+    if (window.testRunner)
+      testRunner.waitUntilDone();
 
     function startTest()
     {
@@ -61,8 +61,8 @@
         mover.className = 'moving';
         
         window.setTimeout(function() {
-          if (window.layoutTestController)
-            layoutTestController.notifyDone();
+          if (window.testRunner)
+            testRunner.notifyDone();
         }, 0);
         
       }, 0);
index 0eb8a7a..7bb20ed 100644 (file)
@@ -5,8 +5,8 @@
     https://bugs.webkit.org/show_bug.cgi?id=76850 -->
     <script>
         window.onload = function() {
-            if (window.layoutTestController)
-                layoutTestController.dumpAsText(true);
+            if (window.testRunner)
+                testRunner.dumpAsText(true);
             if (window.internals)
                 window.internals.settings.setPageScaleFactor(0.5, 0, 0);
         }
index a40683b..aa10dc5 100644 (file)
@@ -24,8 +24,8 @@
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-      layoutTestController.waitUntilDone();
+    if (window.testRunner)
+      testRunner.waitUntilDone();
 
     function doTest()
     {
@@ -35,8 +35,8 @@
         scrollables[i].scrollTop = 50;
       }
 
-      if (window.layoutTestController)
-        layoutTestController.notifyDone();
+      if (window.testRunner)
+        testRunner.notifyDone();
     }
 
     window.addEventListener('load', doTest, false);
index afa859f..e4cf6cd 100644 (file)
@@ -42,9 +42,9 @@ resize: both;
   <div class="content"></div>
 </div>
 <script>
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.display(); // Ensure compositor tree is up to date.
-    document.getElementById("layerTree").innerText = layoutTestController.layerTreeAsText();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.display(); // Ensure compositor tree is up to date.
+    document.getElementById("layerTree").innerText = testRunner.layerTreeAsText();
 }
 </script>
index 132337c..e587736 100644 (file)
@@ -59,9 +59,9 @@ function finishTest() {
     document.getElementById("corner").classList.remove("resizeWidget"); // bottom div loses a resize corner but no scrollbars
 }
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText(true);
-    layoutTestController.display(); // Paint once with all overflow controls visible.
+if (window.testRunner) {
+    testRunner.dumpAsText(true);
+    testRunner.display(); // Paint once with all overflow controls visible.
     finishTest();
 } else
     window.setTimeout(finishTest, 0);
index 0fcf2fe..413f46f 100644 (file)
   }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     function doTest()
     {
-        if (window.layoutTestController)
-          document.getElementById('layers').innerText = layoutTestController.layerTreeAsText();
+        if (window.testRunner)
+          document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     }
     
     window.addEventListener('load', doTest, false);
index a99eda4..3c9c2a7 100644 (file)
@@ -56,8 +56,8 @@
     <script type="text/javascript" charset="utf-8">
       function testDone()
       {
-        if (window.layoutTestController)
-          layoutTestController.notifyDone();
+        if (window.testRunner)
+          testRunner.notifyDone();
       }
 
       function modifyDocument()
index 1b01ab7..05ef47d 100644 (file)
@@ -38,4 +38,4 @@
   <div class="resizable composited box">
   </div>
 </body>
-</html>
\ No newline at end of file
+</html>
index 82cd0db..2bf6ad7 100644 (file)
@@ -24,8 +24,8 @@
   }
 </style>
 <script type="text/javascript">
-  if (window.layoutTestController) {
-    layoutTestController.dumpAsText(true);
+  if (window.testRunner) {
+    testRunner.dumpAsText(true);
   }
 </script>
 </head>
index 45342fb..b91bd4e 100644 (file)
@@ -9,23 +9,23 @@
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     function doTest()
     {
         window.setTimeout(function() {
-            if (window.layoutTestController) {
-                var layers = layoutTestController.layerTreeAsText();
+            if (window.testRunner) {
+                var layers = testRunner.layerTreeAsText();
                 var result;
                 if (layers == "")
                   result = "PASS: no layers found";
                 else
                   result = "FAIL: found layers " + layers;
                 document.getElementById('result').innerHTML = result;
-                layoutTestController.notifyDone();
+                testRunner.notifyDone();
             }
         }, 0);
     }
index 61013c0..b2c35fc 100644 (file)
   </style>
 
   <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     var paintCount = 0;
 
     function onLoad()
     {
-      layoutTestController.display();
+      testRunner.display();
       paintCount = 0;
       document.getElementById('testPlugin').invalidateRect(0, 0, 200, 200);
-      layoutTestController.displayInvalidatedRegion();
+      testRunner.displayInvalidatedRegion();
       if (paintCount > 0)
           document.getElementById('result').innerHTML = "SUCCESS";
     }
index f2a2fe2..aed493a 100644 (file)
@@ -20,9 +20,9 @@
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     function doTest()
           document.getElementById('plugin').className = 'small';
           // Need to wait for compositing layers to be updated.
           window.setTimeout(function() {
-              if (window.layoutTestController) {
-                  var layers = layoutTestController.layerTreeAsText();
+              if (window.testRunner) {
+                  var layers = testRunner.layerTreeAsText();
                   var result;
                   if (layers == "")
                     result = "PASS: no layers found";
                   else
                     result = "FAIL: found layers " + layers;
                   document.getElementById('result').innerHTML = result;
-                  layoutTestController.notifyDone();
+                  testRunner.notifyDone();
               }
           }, 0);
         }, 0);
index fe0c4bd..bdfb27f 100644 (file)
@@ -20,9 +20,9 @@
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
     }
 
     function doTest()
@@ -31,9 +31,9 @@
           document.getElementById('plugin').className = 'large';
           // Need to wait for compositing layers to be updated. FIXME remove.
           window.setTimeout(function() {
-            if (window.layoutTestController) {
-                document.getElementById('layers').innerHTML = layoutTestController.layerTreeAsText();
-                layoutTestController.notifyDone();
+            if (window.testRunner) {
+                document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
+                testRunner.notifyDone();
             }
           }, 0)
         }, 0);
index 30b3fa4..dac5b05 100644 (file)
   </style>
   <script>
     
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText(true);
-      layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+      testRunner.dumpAsText(true);
+      testRunner.waitUntilDone();
     }
     
     function doTest()
     {
       window.setTimeout(function() {
         document.getElementById('test').style.backgroundColor = 'transparent';
-        if (window.layoutTestController)
-          layoutTestController.notifyDone();
+        if (window.testRunner)
+          testRunner.notifyDone();
       }, 0);
     }
     window.addEventListener('load', doTest, false);
index 85dfd45..6c06386 100644 (file)
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-      layoutTestController.waitUntilDone();
+    if (window.testRunner)
+      testRunner.waitUntilDone();
 
     function doTest()
     {
       window.setTimeout(function() {
         document.getElementById('inner').className = 'composited';
-        if (window.layoutTestController)
-          layoutTestController.notifyDone();
+        if (window.testRunner)
+          testRunner.notifyDone();
       }, 0);
     }
     window.addEventListener('load', doTest, false);
index 2d71f50..750347e 100644 (file)
@@ -13,8 +13,8 @@
                }
        </style>
        <script type="text/javascript" charset="utf-8">
-               if (window.layoutTestController)
-                       layoutTestController.dumpAsText();
+               if (window.testRunner)
+                       testRunner.dumpAsText();
        </script>
 </head>
 <body>
index 4476b01..22d2e06 100644 (file)
@@ -25,8 +25,8 @@
   <script type="text/javascript" charset="utf-8">
     function testDone()
     {
-      if (window.layoutTestController)
-        layoutTestController.notifyDone();
+      if (window.testRunner)
+        testRunner.notifyDone();
     }
 
     function doTest()
index 7f5a679..5d64f4d 100644 (file)
   }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-      layoutTestController.waitUntilDone();
+    if (window.testRunner)
+      testRunner.waitUntilDone();
 
     function doTest()
     {
       window.setTimeout(function() {
         document.getElementById('inner').className = 'inner composited changed';
-        if (window.layoutTestController)
-          layoutTestController.notifyDone();
+        if (window.testRunner)
+          testRunner.notifyDone();
       }, 0);
     }
     window.addEventListener('load', doTest, false);
@@ -49,4 +49,4 @@
     </div>
   </div>
 </body>
-</html>
\ No newline at end of file
+</html>
index 1b836de..98bf8ec 100644 (file)
   }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-      layoutTestController.waitUntilDone();
+    if (window.testRunner)
+      testRunner.waitUntilDone();
 
     function doTest()
     {
       window.setTimeout(function() {
         document.getElementById('inner').className = 'inner composited masked';
-        if (window.layoutTestController)
-          layoutTestController.notifyDone();
+        if (window.testRunner)
+          testRunner.notifyDone();
       }, 0);
     }
     window.addEventListener('load', doTest, false);
index e37477b..93638f5 100644 (file)
   }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-      layoutTestController.waitUntilDone();
+    if (window.testRunner)
+      testRunner.waitUntilDone();
 
     function doTest()
     {
       window.setTimeout(function() {
         document.getElementById('inner').style.opacity = '0.5';
-        if (window.layoutTestController)
-          layoutTestController.notifyDone();
+        if (window.testRunner)
+          testRunner.notifyDone();
       }, 0);
     }
     window.addEventListener('load', doTest, false);
@@ -48,4 +48,4 @@
     </div>
   </div>
 </body>
-</html>
\ No newline at end of file
+</html>
index 5a479d5..f87d8a8 100644 (file)
   }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-      layoutTestController.waitUntilDone();
+    if (window.testRunner)
+      testRunner.waitUntilDone();
 
     function doTest()
     {
       window.setTimeout(function() {
         document.getElementById('inner').className = 'inner composited bigger';
-        if (window.layoutTestController)
-          layoutTestController.notifyDone();
+        if (window.testRunner)
+          testRunner.notifyDone();
       }, 0);
     }
     window.addEventListener('load', doTest, false);
@@ -52,4 +52,4 @@
     </div>
   </div>
 </body>
-</html>
\ No newline at end of file
+</html>
index 25edea9..82fbe91 100644 (file)
@@ -22,8 +22,8 @@
       }
     </style>
     <script type="text/javascript">
-      if (window.layoutTestController)
-        layoutTestController.waitUntilDone();
+      if (window.testRunner)
+        testRunner.waitUntilDone();
 
       var reflectionOn = true;
       function toggleReflection()
@@ -41,8 +41,8 @@
           window.setTimeout(function() {
             toggleReflection(); // add
           
-            if (window.layoutTestController)
-              layoutTestController.notifyDone();
+            if (window.testRunner)
+              testRunner.notifyDone();
           }, 0);
         }, 50);
       }
@@ -55,4 +55,4 @@
     <div id="indicator"></div>
     <div id="box"></div>
   </body>
-</html>
\ No newline at end of file
+</html>
index 375d4d3..de5ea31 100644 (file)
@@ -15,8 +15,8 @@
 
 <script>
 
-if (window.layoutTestController)
-  layoutTestController.dumpAsText();
+if (window.testRunner)
+  testRunner.dumpAsText();
 
 window.onload = function() {
     document.execCommand("SelectAll", false, false)
index caf7309..8b80eae 100644 (file)
@@ -43,8 +43,8 @@
     }
     </style>
     <script type="text/javascript" charset="utf-8">
-      if (window.layoutTestController)
-        layoutTestController.waitUntilDone();
+      if (window.testRunner)
+        testRunner.waitUntilDone();
 
       function runTest()
       {
@@ -52,8 +52,8 @@
         window.setTimeout(function() {
           document.getElementById("container").className = "";
           window.setTimeout(function() {
-            if (window.layoutTestController)
-              layoutTestController.notifyDone();
+            if (window.testRunner)
+              testRunner.notifyDone();
           }, 250);
         }, 250);
       }
@@ -68,4 +68,4 @@
         <div id="fader"></div>
     </div>
 
-</body></html>
\ No newline at end of file
+</body></html>
index 8247126..3193e49 100644 (file)
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-      layoutTestController.waitUntilDone();
+    if (window.testRunner)
+      testRunner.waitUntilDone();
 
     function doTest()
     {
       window.setTimeout(function() {
         document.documentElement.className = 'changed';
-        if (window.layoutTestController)
-          layoutTestController.notifyDone();
+        if (window.testRunner)
+          testRunner.notifyDone();
       }, 0);
     }
     window.addEventListener('load', doTest, false);
index 0c0caf1..e1dc70b 100644 (file)
@@ -18,8 +18,8 @@
         #target3 { display: none; clear: both; height: 20px; background: green; }
     </style>
     <script>
-        if (window.layoutTestController)
-          layoutTestController.waitUntilDone();
+        if (window.testRunner)
+          testRunner.waitUntilDone();
 
         function repaintTest()
         {
@@ -27,8 +27,8 @@
             document.getElementById('target2').style.height = 'auto';
             document.getElementById('target3').style.display = 'block';
 
-            if (window.layoutTestController)
-              layoutTestController.notifyDone();
+            if (window.testRunner)
+              testRunner.notifyDone();
         }
 
         function runRepaintTest()
index c026f35..38e8342 100644 (file)
@@ -17,8 +17,8 @@
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
+    if (window.testRunner)
+        testRunner.dumpAsText();
 
     function doTest()
     {
index 988aab3..3e38e8e 100644 (file)
     </style>
     <script type="text/javascript" charset="utf-8">
       
-      if (window.layoutTestController)
-        layoutTestController.waitUntilDone();
+      if (window.testRunner)
+        testRunner.waitUntilDone();
 
       function startTest()
       {
         document.getElementById('container').className = 'over';
         window.setTimeout(function() {
           document.getElementById('container').className = '';
-          if (window.layoutTestController)
-            layoutTestController.notifyDone();
+          if (window.testRunner)
+            testRunner.notifyDone();
         }, 150);
       }
       window.addEventListener('load', startTest, false);
index 886116c..06580f2 100644 (file)
     }
     function changeBackground() {
         document.getElementById('tester').style.backgroundColor = 'green';
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
-    if (window.layoutTestController)
-        layoutTestController.waitUntilDone();
+    if (window.testRunner)
+        testRunner.waitUntilDone();
     window.addEventListener('load', doTest, false);
   </script>
 </head>
index ef32750..45575c7 100644 (file)
@@ -49,9 +49,9 @@
 <script src="../../fast/repaint/resources/repaint.js"></script>
 
 <script>
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText(true);
-        layoutTestController.waitUntilDone();
+    if (window.testRunner) {
+        testRunner.dumpAsText(true);
+        testRunner.waitUntilDone();
     }
 
     function changeDivPosition() {
 
         // Force DumpRenderTree to do a layout and repaint here, this is where the repaintRect
         // goes wrong because it does not get updated for a newly composited element.
-        if (window.layoutTestController)
-            layoutTestController.display();
+        if (window.testRunner)
+            testRunner.display();
 
         window.setTimeout(function() {
             // Scrolling a little will demonstrate whether the repaint rect is correct or not.
             document.getElementById('scrolldiv').scrollTop = 500;
-            layoutTestController.notifyDone();
+            testRunner.notifyDone();
         }, 0);
     }
 
index 20033cb..ff2a032 100644 (file)
@@ -41,8 +41,8 @@
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-      layoutTestController.waitUntilDone();
+    if (window.testRunner)
+      testRunner.waitUntilDone();
 
     function runTest()
     {
@@ -53,8 +53,8 @@
         // Now test redraw on .inner
         var inner = document.querySelectorAll('.inner')[0];
         inner.style.backgroundColor = 'green';
-        if (window.layoutTestController)
-          layoutTestController.notifyDone();
+        if (window.testRunner)
+          testRunner.notifyDone();
       }, 0);
     }
 
index faefe93..5981f40 100644 (file)
@@ -40,8 +40,8 @@
     }
   </style>
   <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController)
-      layoutTestController.waitUntilDone();
+    if (window.testRunner)
+      testRunner.waitUntilDone();
 
     function runTest()
     {
@@ -52,8 +52,8 @@
         // Now test redraw on .inner
         var inner = document.querySelectorAll('.inner')[0];
         inner.style.backgroundColor = 'green';
-        if (window.layoutTestController)
-          layoutTestController.notifyDone();
+        if (window.testRunner)
+          testRunner.notifyDone();
       }, 0);
     }
 
index 2b6f848..b3e873e 100644 (file)
         #target3 { display: none; clear: both; height: 20px; background: green; }
     </style>
     <script>
-        if (window.layoutTestController)
-          layoutTestController.waitUntilDone();
+        if (window.testRunner)
+          testRunner.waitUntilDone();
 
         function repaintTest()
         {
             document.getElementById('target1').style.width = '';
             document.getElementById('target2').style.height = '';
             document.getElementById('target3').style.display = '';
-            if (window.layoutTestController)
-              layoutTestController.notifyDone();
+            if (window.testRunner)
+              testRunner.notifyDone();
         }
         function runRepaintTest()
         {
index d9172af..a5a758f 100644 (file)
     }
     function changeBackground2() {
         document.getElementById('tester').style.backgroundColor = 'green';
-        if (window.layoutTestController)
-          layoutTestController.notifyDone();
+        if (window.testRunner)
+          testRunner.notifyDone();
     }
-    if (window.layoutTestController) {
-      layoutTestController.waitUntilDone();
-      layoutTestController.dumpAsText(true);
+    if (window.testRunner) {
+      testRunner.waitUntilDone();
+      testRunner.dumpAsText(true);
     }
     window.addEventListener('load', doTest, false);
   </script>
index e4c9b46..bcab5b1 100755 (executable)
@@ -11,8 +11,8 @@
     </style>\r
     <script src="../../fast/repaint/resources/repaint.js"></script>\r
     <script>\r
-        if (window.layoutTestController)\r
-            layoutTestController.dumpAsText(true);\r
+        if (window.testRunner)\r
+            testRunner.dumpAsText(true);\r
         function repaintTest()\r
         {\r
             document.getElementById("ruler").style.height = "450px";\r
index 4af9783..5c9b052 100644 (file)
@@ -2,15 +2,15 @@
 <!-- Tests that an element composited with transform-style: preserve-3d still renders when switched to transform-style: flat -->
 <div id="box" style="width:100px; height:100px; background-color: green; -webkit-transform: translateZ(0); -webkit-transform-style: preserve-3d"></div>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText(true); // Only pixel results are useful
+if (window.testRunner)
+    testRunner.dumpAsText(true); // Only pixel results are useful
 
 function test() {
     document.getElementById("box").style.webkitTransformStyle = "flat";
 }
 
-if (window.layoutTestController) {
-    layoutTestController.display(); // Force one composite with preserve-3d
+if (window.testRunner) {
+    testRunner.display(); // Force one composite with preserve-3d
     test();
 } else
     window.setTimeout(test, 0);
index 0da79e7..4caa0b7 100644 (file)
@@ -1,6 +1,6 @@
 
-if (window.layoutTestController)
-    layoutTestController.waitUntilDone();
+if (window.testRunner)
+    testRunner.waitUntilDone();
 
 function ensureFrameVisible(video, videoRenderedCallback)
 {
index f2740a7..34ecf43 100644 (file)
@@ -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.
 
         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);
     }
index b8f877a..ddbe371 100644 (file)
 </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);
index d2ff5d2..0ffad8b 100644 (file)
 </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);
index df2ae8a..5785f6b 100644 (file)
@@ -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.
 
         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);
     }
index df6f4d1..c0d21fd 100644 (file)
 </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);
index 3bce527..3aa11dd 100644 (file)
 </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);
index 08e2c15..9d37203 100644 (file)
@@ -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);