⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 130689 in webkit


Ignore:
Timestamp:
Oct 8, 2012, 2:55:10 PM (14 years ago)
Author:
Simon Fraser
Message:

Move layerTreeAsText to window.internals
​https://bugs.webkit.org/show_bug.cgi?id=98690

Reviewed by James Robinson.

Add window.internals.layerTreeAsText(document), and change the tests to use it.
I'll remove testRunner.layerTreeAsText() in a later patch.

Source/WebCore:

  • testing/Internals.cpp:

(WebCore::Internals::layerTreeAsText):

  • testing/Internals.h:

(Internals):

  • testing/Internals.idl:

LayoutTests:

  • compositing/animation/animation-compositing.html:
  • compositing/backing/no-backing-for-clip-overlap.html:
  • compositing/backing/no-backing-for-clip.html:
  • compositing/backing/no-backing-for-perspective.html:
  • compositing/bounds-in-flipped-writing-mode.html:
  • compositing/clip-child-by-non-stacking-ancestor.html:
  • compositing/columns/composited-in-paginated.html:
  • compositing/geometry/ancestor-overflow-change.html:
  • compositing/geometry/bounds-clipped-composited-child.html:
  • compositing/geometry/bounds-ignores-hidden-composited-descendant.html:
  • compositing/geometry/bounds-ignores-hidden-dynamic-negzindex.html:
  • compositing/geometry/bounds-ignores-hidden-dynamic.html:
  • compositing/geometry/bounds-ignores-hidden.html:
  • compositing/geometry/clip.html:
  • compositing/geometry/composited-in-columns.html:
  • compositing/geometry/fixed-position-composited-switch.html:
  • compositing/geometry/flipped-writing-mode.html:
  • compositing/geometry/foreground-layer.html:
  • compositing/geometry/layer-due-to-layer-children-deep-switch.html:
  • compositing/geometry/layer-due-to-layer-children-switch.html:
  • compositing/geometry/limit-layer-bounds-clipping-ancestor.html:
  • compositing/geometry/limit-layer-bounds-fixed-positioned.html:
  • compositing/geometry/limit-layer-bounds-opacity-transition.html:
  • compositing/geometry/limit-layer-bounds-overflow-root.html:
  • compositing/geometry/limit-layer-bounds-positioned-transition.html:
  • compositing/geometry/limit-layer-bounds-positioned.html:
  • compositing/geometry/limit-layer-bounds-transformed-overflow.html:
  • compositing/geometry/limit-layer-bounds-transformed.html:
  • compositing/geometry/preserve-3d-switching.html:
  • compositing/iframes/become-composited-nested-iframes.html:
  • compositing/iframes/become-overlapped-iframe.html:
  • compositing/iframes/composited-parent-iframe.html:
  • compositing/iframes/connect-compositing-iframe-delayed.html:
  • compositing/iframes/connect-compositing-iframe.html:
  • compositing/iframes/connect-compositing-iframe2.html:
  • compositing/iframes/connect-compositing-iframe3.html:
  • compositing/iframes/enter-compositing-iframe.html:
  • compositing/iframes/iframe-resize.html:
  • compositing/iframes/iframe-size-from-zero.html:
  • compositing/iframes/iframe-size-to-zero.html:
  • compositing/iframes/iframe-src-change.html:
  • compositing/iframes/invisible-nested-iframe-hide.html:
  • compositing/iframes/invisible-nested-iframe-show.html:
  • compositing/iframes/leave-compositing-iframe.html:
  • compositing/iframes/overlapped-iframe-iframe.html:
  • compositing/iframes/overlapped-iframe.html:
  • compositing/iframes/overlapped-nested-iframes.html:
  • compositing/iframes/page-cache-layer-tree.html:
  • compositing/iframes/resizer.html:
  • compositing/iframes/scrolling-iframe.html:
  • compositing/images/clip-on-directly-composited-image.html:
  • compositing/layer-creation/animation-overlap-with-children.html:
  • compositing/layer-creation/fixed-position-and-transform.html:
  • compositing/layer-creation/fixed-position-out-of-view.html:
  • compositing/layer-creation/fixed-position-under-transform.html:
  • compositing/layer-creation/no-compositing-for-preserve-3d.html:
  • compositing/layer-creation/overflow-scroll-overlap.html:
  • compositing/layer-creation/overlap-animation.html:
  • compositing/layer-creation/overlap-child-layer.html:
  • compositing/layer-creation/overlap-clipping.html:
  • compositing/layer-creation/overlap-transformed-and-clipped.html:
  • compositing/layer-creation/overlap-transformed-layer.html:
  • compositing/layer-creation/overlap-transforms.html:
  • compositing/layer-creation/rotate3d-overlap.html:
  • compositing/layer-creation/scroll-partial-update.html:
  • compositing/layer-creation/spanOverlapsCanvas.html:
  • compositing/layer-creation/stacking-context-overlap-nested.html:
  • compositing/layer-creation/stacking-context-overlap.html:
  • compositing/layer-creation/translatez-overlap.html:
  • compositing/overflow-trumps-transform-style.html:
  • compositing/overflow/clip-descendents.html:
  • compositing/overflow/content-gains-scrollbars.html:
  • compositing/overflow/content-loses-scrollbars.html:
  • compositing/overflow/overflow-auto-with-touch-no-overflow.html:
  • compositing/overflow/overflow-auto-with-touch-toggle.html:
  • compositing/overflow/overflow-auto-with-touch.html:
  • compositing/overflow/overflow-hidden-with-touch.html:
  • compositing/overflow/overflow-overlay-with-touch-no-overflow.html:
  • compositing/overflow/overflow-overlay-with-touch.html:
  • compositing/overflow/overflow-scroll-with-touch-no-overflow.html:
  • compositing/overflow/overflow-scrollbar-layers.html:
  • compositing/overflow/overflow-visible-with-touch.html:
  • compositing/overflow/resize-painting.html:
  • compositing/overflow/scrolling-content-clip-to-viewport.html:
  • compositing/overflow/textarea-scroll-touch.html:
  • compositing/plugins/1x1-composited-plugin.html:
  • compositing/plugins/large-to-small-composited-plugin.html:
  • compositing/plugins/no-backing-store.html:
  • compositing/plugins/small-to-large-composited-plugin.html:
  • compositing/rtl/rtl-absolute-overflow-scrolled.html:
  • compositing/rtl/rtl-absolute-overflow.html:
  • compositing/rtl/rtl-absolute.html:
  • compositing/rtl/rtl-fixed-overflow-scrolled.html:
  • compositing/rtl/rtl-fixed-overflow.html:
  • compositing/rtl/rtl-fixed.html:
  • compositing/rtl/rtl-iframe-absolute-overflow-scrolled.html:
  • compositing/rtl/rtl-iframe-absolute-overflow.html:
  • compositing/rtl/rtl-iframe-absolute.html:
  • compositing/rtl/rtl-iframe-fixed-overflow-scrolled.html:
  • compositing/rtl/rtl-iframe-fixed-overflow.html:
  • compositing/rtl/rtl-iframe-fixed.html:
  • compositing/rtl/rtl-iframe-relative.html:
  • compositing/rtl/rtl-relative.html:
  • compositing/tiled-layers-hidpi.html:
  • compositing/tiling/crash-reparent-tiled-layer.html:
  • compositing/tiling/huge-layer-add-remove-child.html-disabled:
  • compositing/tiling/huge-layer-img.html-disabled:
  • compositing/tiling/huge-layer-resize.html-disabled:
  • compositing/tiling/huge-layer-with-layer-children-resize.html-disabled:
  • compositing/tiling/huge-layer-with-layer-children.html-disabled:
  • compositing/tiling/huge-layer.html-disabled:
  • compositing/video/video-poster.html:
  • compositing/visibility/layer-visible-content.html:
  • compositing/visibility/visibility-image-layers-dynamic.html:
  • css3/compositing/should-have-compositing-layer.html:
  • css3/filters/composited-during-animation-layertree.html:
  • css3/filters/composited-during-transition-layertree.html:
  • css3/filters/filtered-compositing-descendant.html:
  • css3/filters/should-not-have-compositing-layer.html:
  • platform/chromium-android/compositing/layer-creation/overflow-scrolling-touch.html:
  • platform/chromium/compositing/force-compositing-mode/force-composite-empty.html:
  • platform/chromium/compositing/force-compositing-mode/no-overflow-iframe-layer.html:
  • platform/chromium/compositing/force-compositing-mode/overflow-hidden-iframe-layer.html:
  • platform/chromium/compositing/force-compositing-mode/overflow-iframe-enter-compositing.html:
  • platform/chromium/compositing/force-compositing-mode/overflow-iframe-layer.html:
  • platform/chromium/compositing/force-compositing-mode/overflow-iframe-leave-compositing.html:
  • platform/mac/compositing/canvas/accelerated-canvas-compositing.html:
Location:
trunk
Files:
132 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r130687 r130689  
     12012-10-08  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Move layerTreeAsText to window.internals
     4        https://bugs.webkit.org/show_bug.cgi?id=98690
     5
     6        Reviewed by James Robinson.
     7
     8        Add window.internals.layerTreeAsText(document), and change the tests to use it.
     9        I'll remove testRunner.layerTreeAsText() in a later patch.
     10
     11        * compositing/animation/animation-compositing.html:
     12        * compositing/backing/no-backing-for-clip-overlap.html:
     13        * compositing/backing/no-backing-for-clip.html:
     14        * compositing/backing/no-backing-for-perspective.html:
     15        * compositing/bounds-in-flipped-writing-mode.html:
     16        * compositing/clip-child-by-non-stacking-ancestor.html:
     17        * compositing/columns/composited-in-paginated.html:
     18        * compositing/geometry/ancestor-overflow-change.html:
     19        * compositing/geometry/bounds-clipped-composited-child.html:
     20        * compositing/geometry/bounds-ignores-hidden-composited-descendant.html:
     21        * compositing/geometry/bounds-ignores-hidden-dynamic-negzindex.html:
     22        * compositing/geometry/bounds-ignores-hidden-dynamic.html:
     23        * compositing/geometry/bounds-ignores-hidden.html:
     24        * compositing/geometry/clip.html:
     25        * compositing/geometry/composited-in-columns.html:
     26        * compositing/geometry/fixed-position-composited-switch.html:
     27        * compositing/geometry/flipped-writing-mode.html:
     28        * compositing/geometry/foreground-layer.html:
     29        * compositing/geometry/layer-due-to-layer-children-deep-switch.html:
     30        * compositing/geometry/layer-due-to-layer-children-switch.html:
     31        * compositing/geometry/limit-layer-bounds-clipping-ancestor.html:
     32        * compositing/geometry/limit-layer-bounds-fixed-positioned.html:
     33        * compositing/geometry/limit-layer-bounds-opacity-transition.html:
     34        * compositing/geometry/limit-layer-bounds-overflow-root.html:
     35        * compositing/geometry/limit-layer-bounds-positioned-transition.html:
     36        * compositing/geometry/limit-layer-bounds-positioned.html:
     37        * compositing/geometry/limit-layer-bounds-transformed-overflow.html:
     38        * compositing/geometry/limit-layer-bounds-transformed.html:
     39        * compositing/geometry/preserve-3d-switching.html:
     40        * compositing/iframes/become-composited-nested-iframes.html:
     41        * compositing/iframes/become-overlapped-iframe.html:
     42        * compositing/iframes/composited-parent-iframe.html:
     43        * compositing/iframes/connect-compositing-iframe-delayed.html:
     44        * compositing/iframes/connect-compositing-iframe.html:
     45        * compositing/iframes/connect-compositing-iframe2.html:
     46        * compositing/iframes/connect-compositing-iframe3.html:
     47        * compositing/iframes/enter-compositing-iframe.html:
     48        * compositing/iframes/iframe-resize.html:
     49        * compositing/iframes/iframe-size-from-zero.html:
     50        * compositing/iframes/iframe-size-to-zero.html:
     51        * compositing/iframes/iframe-src-change.html:
     52        * compositing/iframes/invisible-nested-iframe-hide.html:
     53        * compositing/iframes/invisible-nested-iframe-show.html:
     54        * compositing/iframes/leave-compositing-iframe.html:
     55        * compositing/iframes/overlapped-iframe-iframe.html:
     56        * compositing/iframes/overlapped-iframe.html:
     57        * compositing/iframes/overlapped-nested-iframes.html:
     58        * compositing/iframes/page-cache-layer-tree.html:
     59        * compositing/iframes/resizer.html:
     60        * compositing/iframes/scrolling-iframe.html:
     61        * compositing/images/clip-on-directly-composited-image.html:
     62        * compositing/layer-creation/animation-overlap-with-children.html:
     63        * compositing/layer-creation/fixed-position-and-transform.html:
     64        * compositing/layer-creation/fixed-position-out-of-view.html:
     65        * compositing/layer-creation/fixed-position-under-transform.html:
     66        * compositing/layer-creation/no-compositing-for-preserve-3d.html:
     67        * compositing/layer-creation/overflow-scroll-overlap.html:
     68        * compositing/layer-creation/overlap-animation.html:
     69        * compositing/layer-creation/overlap-child-layer.html:
     70        * compositing/layer-creation/overlap-clipping.html:
     71        * compositing/layer-creation/overlap-transformed-and-clipped.html:
     72        * compositing/layer-creation/overlap-transformed-layer.html:
     73        * compositing/layer-creation/overlap-transforms.html:
     74        * compositing/layer-creation/rotate3d-overlap.html:
     75        * compositing/layer-creation/scroll-partial-update.html:
     76        * compositing/layer-creation/spanOverlapsCanvas.html:
     77        * compositing/layer-creation/stacking-context-overlap-nested.html:
     78        * compositing/layer-creation/stacking-context-overlap.html:
     79        * compositing/layer-creation/translatez-overlap.html:
     80        * compositing/overflow-trumps-transform-style.html:
     81        * compositing/overflow/clip-descendents.html:
     82        * compositing/overflow/content-gains-scrollbars.html:
     83        * compositing/overflow/content-loses-scrollbars.html:
     84        * compositing/overflow/overflow-auto-with-touch-no-overflow.html:
     85        * compositing/overflow/overflow-auto-with-touch-toggle.html:
     86        * compositing/overflow/overflow-auto-with-touch.html:
     87        * compositing/overflow/overflow-hidden-with-touch.html:
     88        * compositing/overflow/overflow-overlay-with-touch-no-overflow.html:
     89        * compositing/overflow/overflow-overlay-with-touch.html:
     90        * compositing/overflow/overflow-scroll-with-touch-no-overflow.html:
     91        * compositing/overflow/overflow-scrollbar-layers.html:
     92        * compositing/overflow/overflow-visible-with-touch.html:
     93        * compositing/overflow/resize-painting.html:
     94        * compositing/overflow/scrolling-content-clip-to-viewport.html:
     95        * compositing/overflow/textarea-scroll-touch.html:
     96        * compositing/plugins/1x1-composited-plugin.html:
     97        * compositing/plugins/large-to-small-composited-plugin.html:
     98        * compositing/plugins/no-backing-store.html:
     99        * compositing/plugins/small-to-large-composited-plugin.html:
     100        * compositing/rtl/rtl-absolute-overflow-scrolled.html:
     101        * compositing/rtl/rtl-absolute-overflow.html:
     102        * compositing/rtl/rtl-absolute.html:
     103        * compositing/rtl/rtl-fixed-overflow-scrolled.html:
     104        * compositing/rtl/rtl-fixed-overflow.html:
     105        * compositing/rtl/rtl-fixed.html:
     106        * compositing/rtl/rtl-iframe-absolute-overflow-scrolled.html:
     107        * compositing/rtl/rtl-iframe-absolute-overflow.html:
     108        * compositing/rtl/rtl-iframe-absolute.html:
     109        * compositing/rtl/rtl-iframe-fixed-overflow-scrolled.html:
     110        * compositing/rtl/rtl-iframe-fixed-overflow.html:
     111        * compositing/rtl/rtl-iframe-fixed.html:
     112        * compositing/rtl/rtl-iframe-relative.html:
     113        * compositing/rtl/rtl-relative.html:
     114        * compositing/tiled-layers-hidpi.html:
     115        * compositing/tiling/crash-reparent-tiled-layer.html:
     116        * compositing/tiling/huge-layer-add-remove-child.html-disabled:
     117        * compositing/tiling/huge-layer-img.html-disabled:
     118        * compositing/tiling/huge-layer-resize.html-disabled:
     119        * compositing/tiling/huge-layer-with-layer-children-resize.html-disabled:
     120        * compositing/tiling/huge-layer-with-layer-children.html-disabled:
     121        * compositing/tiling/huge-layer.html-disabled:
     122        * compositing/video/video-poster.html:
     123        * compositing/visibility/layer-visible-content.html:
     124        * compositing/visibility/visibility-image-layers-dynamic.html:
     125        * css3/compositing/should-have-compositing-layer.html:
     126        * css3/filters/composited-during-animation-layertree.html:
     127        * css3/filters/composited-during-transition-layertree.html:
     128        * css3/filters/filtered-compositing-descendant.html:
     129        * css3/filters/should-not-have-compositing-layer.html:
     130        * platform/chromium-android/compositing/layer-creation/overflow-scrolling-touch.html:
     131        * platform/chromium/compositing/force-compositing-mode/force-composite-empty.html:
     132        * platform/chromium/compositing/force-compositing-mode/no-overflow-iframe-layer.html:
     133        * platform/chromium/compositing/force-compositing-mode/overflow-hidden-iframe-layer.html:
     134        * platform/chromium/compositing/force-compositing-mode/overflow-iframe-enter-compositing.html:
     135        * platform/chromium/compositing/force-compositing-mode/overflow-iframe-layer.html:
     136        * platform/chromium/compositing/force-compositing-mode/overflow-iframe-leave-compositing.html:
     137        * platform/mac/compositing/canvas/accelerated-canvas-compositing.html:
     138
    11392012-10-08  Hans Muller  <hmuller@adobe.com>
    2140

  • trunk/LayoutTests/compositing/animation/animation-compositing.html

    r119992 r130689  
    3030      box.addEventListener('webkitAnimationStart', function() {
    3131        if (window.testRunner) {
    32             var layers = testRunner.layerTreeAsText();
     32            var layers = window.internals.layerTreeAsText(document);
    3333            var result;
    3434            if (layers != "")

  • trunk/LayoutTests/compositing/backing/no-backing-for-clip-overlap.html

    r119992 r130689  
    3636    var layersResult = document.getElementById('layers');
    3737    if (window.testRunner)
    38       layersResult.innerText = testRunner.layerTreeAsText();
     38      layersResult.innerText = window.internals.layerTreeAsText(document);
    3939   
    4040  }

  • trunk/LayoutTests/compositing/backing/no-backing-for-clip.html

    r119992 r130689  
    3636    var layersResult = document.getElementById('layers');
    3737    if (window.testRunner)
    38       layersResult.innerText = testRunner.layerTreeAsText();
     38      layersResult.innerText = window.internals.layerTreeAsText(document);
    3939   
    4040  }

  • trunk/LayoutTests/compositing/backing/no-backing-for-perspective.html

    r119992 r130689  
    3434    var layersResult = document.getElementById('layers');
    3535    if (window.testRunner)
    36       layersResult.innerText = testRunner.layerTreeAsText();
     36      layersResult.innerText = window.internals.layerTreeAsText(document);
    3737   
    3838  }

  • trunk/LayoutTests/compositing/bounds-in-flipped-writing-mode.html

    r119992 r130689  
    88        if (window.testRunner) {
    99            testRunner.dumpAsText();
    10             document.getElementById("console").appendChild(document.createTextNode(testRunner.layerTreeAsText()));
     10            document.getElementById("console").appendChild(document.createTextNode(window.internals.layerTreeAsText(document)));
    1111        }
    1212    </script>

  • trunk/LayoutTests/compositing/clip-child-by-non-stacking-ancestor.html

    r119992 r130689  
    4141    {
    4242        if (window.testRunner) {
    43             document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
     43            document.getElementById('layertree').innerText = window.internals.layerTreeAsText(document);
    4444            testRunner.notifyDone();
    4545        }

  • trunk/LayoutTests/compositing/columns/composited-in-paginated.html

    r122770 r130689  
    1111        {
    1212            if (window.testRunner)
    13                 document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     13                document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    1414        }
    1515        window.addEventListener('load', dumpLayers, false);

  • trunk/LayoutTests/compositing/geometry/ancestor-overflow-change.html

    r119992 r130689  
    4646
    4747      if (window.testRunner)
    48         document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     48        document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    4949     
    5050      if (window.testRunner)

  • trunk/LayoutTests/compositing/geometry/bounds-clipped-composited-child.html

    r119992 r130689  
    4343    {
    4444      if (window.testRunner)
    45         document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     45        document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    4646    }
    4747

  • trunk/LayoutTests/compositing/geometry/bounds-ignores-hidden-composited-descendant.html

    r123971 r130689  
    3232    {
    3333        if (window.testRunner) {
    34             document.getElementById('layers').innerText = window.testRunner.layerTreeAsText();
     34            document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    3535        }
    3636    }

  • trunk/LayoutTests/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex.html

    r123972 r130689  
    6666            document.body.classList.add('changed');
    6767            if (window.testRunner) {
    68                 document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     68                document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    6969                testRunner.notifyDone();
    7070            }

  • trunk/LayoutTests/compositing/geometry/bounds-ignores-hidden-dynamic.html

    r123971 r130689  
    4545            document.body.classList.add('changed');
    4646            if (window.testRunner) {
    47                 document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     47                document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    4848                testRunner.notifyDone();
    4949            }

  • trunk/LayoutTests/compositing/geometry/bounds-ignores-hidden.html

    r123971 r130689  
    1717    {
    1818        if (window.testRunner) {
    19             document.getElementById('layers').innerText = window.testRunner.layerTreeAsText();
     19            document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    2020        }
    2121    }

  • trunk/LayoutTests/compositing/geometry/clip.html

    r119992 r130689  
    4040    function doTest() {
    4141      if (window.testRunner) {
    42         document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     42        document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    4343        testRunner.notifyDone();
    4444      }

  • trunk/LayoutTests/compositing/geometry/composited-in-columns.html

    r119992 r130689  
    4444    {
    4545      if (window.testRunner)
    46         document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     46        document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    4747    }
    4848   

  • trunk/LayoutTests/compositing/geometry/fixed-position-composited-switch.html

    r119992 r130689  
    2929      // it cannot get a composited layer.
    3030      if (window.testRunner)
    31         layerTreeOutput += 'Before (should be empty): \n' + testRunner.layerTreeAsText() + '\n';
     31        layerTreeOutput += 'Before (should be empty): \n' + window.internals.layerTreeAsText(document) + '\n';
    3232
    3333      // Adding a z-index to the fixed position element will give it a stacking context
    … …  
    3636
    3737      if (window.testRunner) {
    38         layerTreeOutput += 'After (should not be empty): \n' + testRunner.layerTreeAsText();
     38        layerTreeOutput += 'After (should not be empty): \n' + window.internals.layerTreeAsText(document);
    3939        document.getElementById('layertree').innerText = layerTreeOutput;
    4040        testRunner.dumpAsText();
    … …  
    4444      document.getElementById('container').style.webkitTransform = 'translateX(0)';
    4545      if (window.testRunner) {
    46         layerTreeOutput += 'After (should be empty): \n' + testRunner.layerTreeAsText();
     46        layerTreeOutput += 'After (should be empty): \n' + window.internals.layerTreeAsText(document);
    4747        document.getElementById('layertree').innerText = layerTreeOutput;
    4848        testRunner.dumpAsText();

  • trunk/LayoutTests/compositing/geometry/flipped-writing-mode.html

    r119992 r130689  
    4444    {
    4545      if (window.testRunner)
    46         document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     46        document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    4747    }
    4848   

  • trunk/LayoutTests/compositing/geometry/foreground-layer.html

    r119992 r130689  
    6363    {
    6464      if (window.testRunner)
    65         document.getElementById('layer-tree').innerText = testRunner.layerTreeAsText();
     65        document.getElementById('layer-tree').innerText = window.internals.layerTreeAsText(document);
    6666    }
    6767   

  • trunk/LayoutTests/compositing/geometry/layer-due-to-layer-children-deep-switch.html

    r119992 r130689  
    5656            if (window.testRunner) {
    5757                text += "\n" + which + " dump layer tree:\n";
    58                 text += testRunner.layerTreeAsText();
     58                text += window.internals.layerTreeAsText(document);
    5959                document.getElementById('layers').innerText = text;
    6060            }

  • trunk/LayoutTests/compositing/geometry/layer-due-to-layer-children-switch.html

    r119992 r130689  
    3737            if (window.testRunner) {
    3838                text += "\n" + which + " dump layer tree:\n";
    39                 text += testRunner.layerTreeAsText();
     39                text += window.internals.layerTreeAsText(document);
    4040                document.getElementById('layers').innerText = text;
    4141            }

  • trunk/LayoutTests/compositing/geometry/limit-layer-bounds-clipping-ancestor.html

    r119992 r130689  
    5959
    6060      if (window.testRunner) {
    61         document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     61        document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    6262        testRunner.notifyDone();
    6363      }

  • trunk/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-positioned.html

    r119992 r130689  
    5353
    5454      if (window.testRunner) {
    55         document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     55        document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    5656        testRunner.notifyDone();
    5757      }

  • trunk/LayoutTests/compositing/geometry/limit-layer-bounds-opacity-transition.html

    r119992 r130689  
    3535    {
    3636      if (window.testRunner) {
    37         document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     37        document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    3838        testRunner.notifyDone();
    3939      }

  • trunk/LayoutTests/compositing/geometry/limit-layer-bounds-overflow-root.html

    r119992 r130689  
    5555    {
    5656      if (window.testRunner) {
    57         document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     57        document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    5858        testRunner.notifyDone();
    5959      }

  • trunk/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-transition.html

    r119992 r130689  
    5555      document.getElementById('far-left').className = 'moved';
    5656      if (window.testRunner) {
    57         document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     57        document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    5858        testRunner.notifyDone();
    5959      }

  • trunk/LayoutTests/compositing/geometry/limit-layer-bounds-positioned.html

    r119992 r130689  
    5050    {
    5151      if (window.testRunner) {
    52         document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     52        document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    5353        testRunner.notifyDone();
    5454      }

  • trunk/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-overflow.html

    r119992 r130689  
    5858        // We need to call display() here to sync the compositor state and avoid a race condition.
    5959        testRunner.display();
    60         document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     60        document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    6161        testRunner.notifyDone();
    6262      }

  • trunk/LayoutTests/compositing/geometry/limit-layer-bounds-transformed.html

    r119992 r130689  
    5151    {
    5252      if (window.testRunner) {
    53         document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     53        document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    5454        testRunner.notifyDone();
    5555      }

  • trunk/LayoutTests/compositing/geometry/preserve-3d-switching.html

    r119992 r130689  
    6262                if (window.testRunner) {
    6363                    if (testRunner.layerTreeAsText) {
    64                         var layerTree = testRunner.layerTreeAsText();
     64                        var layerTree = window.internals.layerTreeAsText(document);
    6565                        document.getElementById("layerTree").innerHTML = "<pre>" + layerTree + "</pre>";
    6666                    }

  • trunk/LayoutTests/compositing/iframes/become-composited-nested-iframes.html

    r119992 r130689  
    3939          if (window.testRunner) {
    4040              testRunner.display();
    41               document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
     41              document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document);
    4242              testRunner.notifyDone();
    4343          }

  • trunk/LayoutTests/compositing/iframes/become-overlapped-iframe.html

    r119992 r130689  
    3939            if (window.testRunner) {
    4040                testRunner.display(); // Painting has to happen to detect overlap.
    41                 document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
     41                document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document);
    4242                testRunner.notifyDone();
    4343            }

  • trunk/LayoutTests/compositing/iframes/composited-parent-iframe.html

    r119992 r130689  
    2222    {
    2323        if (window.testRunner) {
    24             document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
     24            document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document);
    2525            testRunner.notifyDone();
    2626        }

  • trunk/LayoutTests/compositing/iframes/connect-compositing-iframe-delayed.html

    r119992 r130689  
    3838        if (window.testRunner) {
    3939          document.getElementById('iframe').contentDocument.body.offsetWidth; // update iframe layout
    40           document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     40          document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    4141          testRunner.notifyDone();
    4242        }

  • trunk/LayoutTests/compositing/iframes/connect-compositing-iframe.html

    r119992 r130689  
    3939
    4040      if (window.testRunner) {
    41         document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     41        document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    4242        testRunner.notifyDone();
    4343      }

  • trunk/LayoutTests/compositing/iframes/connect-compositing-iframe2.html

    r119992 r130689  
    3838
    3939      if (window.testRunner) {
    40         document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     40        document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    4141        testRunner.notifyDone();
    4242      }

  • trunk/LayoutTests/compositing/iframes/connect-compositing-iframe3.html

    r119992 r130689  
    3232
    3333      if (window.testRunner) {
    34         document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     34        document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    3535        testRunner.notifyDone();
    3636      }

  • trunk/LayoutTests/compositing/iframes/enter-compositing-iframe.html

    r119992 r130689  
    3535      if (window.testRunner) {
    3636        testRunner.display();
    37         document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     37        document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    3838        testRunner.notifyDone();
    3939      }

  • trunk/LayoutTests/compositing/iframes/iframe-resize.html

    r119992 r130689  
    4444            if (window.testRunner) {
    4545                testRunner.display();
    46                 document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
     46                document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document);
    4747                testRunner.notifyDone();
    4848            }

  • trunk/LayoutTests/compositing/iframes/iframe-size-from-zero.html

    r119992 r130689  
    3939            window.setTimeout(function() {
    4040                if (window.testRunner) {
    41                     document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
     41                    document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document);
    4242                    testRunner.notifyDone();
    4343                }

  • trunk/LayoutTests/compositing/iframes/iframe-size-to-zero.html

    r119992 r130689  
    4141            var hadLayers = false;
    4242            if (window.testRunner) {
    43                 var layers = testRunner.layerTreeAsText();
     43                var layers = window.internals.layerTreeAsText(document);
    4444                hadLayers = layers != "";
    4545            }
    … …  
    5050
    5151                testRunner.display();
    52                 var haveLayers = testRunner.layerTreeAsText() != "";
     52                var haveLayers = window.internals.layerTreeAsText(document) != "";
    5353                var result;
    5454                if (hadLayers && !haveLayers)

  • trunk/LayoutTests/compositing/iframes/iframe-src-change.html

    r119992 r130689  
    3737            if (window.testRunner) {
    3838                testRunner.display(); // Need to paint for overlap testing.
    39                 hadLayersBefore = testRunner.layerTreeAsText() != "";
     39                hadLayersBefore = window.internals.layerTreeAsText(document) != "";
    4040            }
    4141
    … …  
    4444            window.setTimeout(function() {
    4545                if (window.testRunner) {
    46                     hadLayersAfter = testRunner.layerTreeAsText() != "";
     46                    hadLayersAfter = window.internals.layerTreeAsText(document) != "";
    4747
    4848                    var results = document.getElementById('results');

  • trunk/LayoutTests/compositing/iframes/invisible-nested-iframe-hide.html

    r119992 r130689  
    3838        if (window.testRunner) {
    3939          testRunner.display();
    40           document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
     40          document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document);
    4141          testRunner.notifyDone();
    4242        }

  • trunk/LayoutTests/compositing/iframes/invisible-nested-iframe-show.html

    r119992 r130689  
    3838        if (window.testRunner) {
    3939          testRunner.display();
    40           document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
     40          document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document);
    4141          testRunner.notifyDone();
    4242        }

  • trunk/LayoutTests/compositing/iframes/leave-compositing-iframe.html

    r119992 r130689  
    3737
    3838      if (window.testRunner) {
    39         document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     39        document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    4040        testRunner.notifyDone();
    4141      }

  • trunk/LayoutTests/compositing/iframes/overlapped-iframe-iframe.html

    r119992 r130689  
    3737            if (window.testRunner) {
    3838                testRunner.display();
    39                 document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
     39                document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document);
    4040                testRunner.notifyDone();
    4141            }

  • trunk/LayoutTests/compositing/iframes/overlapped-iframe.html

    r119992 r130689  
    3535          if (window.testRunner) {
    3636              testRunner.display();
    37               document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
     37              document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document);
    3838              testRunner.notifyDone();
    3939          }

  • trunk/LayoutTests/compositing/iframes/overlapped-nested-iframes.html

    r119992 r130689  
    3838          window.setTimeout(function() {
    3939            if (window.testRunner) {
    40                 document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
     40                document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document);
    4141                testRunner.notifyDone();
    4242            }

  • trunk/LayoutTests/compositing/iframes/page-cache-layer-tree.html

    r119992 r130689  
    5555    function finishTest() {
    5656        var output = document.getElementById("output");
    57         output.innerText = testRunner.layerTreeAsText();
     57        output.innerText = window.internals.layerTreeAsText(document);
    5858
    5959        if (window.testRunner)

  • trunk/LayoutTests/compositing/iframes/resizer.html

    r119992 r130689  
    1010    if (window.testRunner) {
    1111        testRunner.dumpAsText();
    12         document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
     12        document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document);
    1313    }
    1414}

  • trunk/LayoutTests/compositing/iframes/scrolling-iframe.html

    r119992 r130689  
    3838            document.getElementById('parent-iframe').contentWindow.scrollTo(80, 80);
    3939            if (window.testRunner) {
    40                 document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
     40                document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document);
    4141                testRunner.notifyDone();
    4242            }

  • trunk/LayoutTests/compositing/images/clip-on-directly-composited-image.html

    r119992 r130689  
    3030    function doTest() {
    3131      if (window.testRunner) {
    32         document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     32        document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    3333        testRunner.notifyDone();
    3434      }

  • trunk/LayoutTests/compositing/layer-creation/animation-overlap-with-children.html

    r123151 r130689  
    6969    {
    7070      if (window.testRunner) {
    71         document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     71        document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    7272        testRunner.notifyDone();
    7373      }

  • trunk/LayoutTests/compositing/layer-creation/fixed-position-and-transform.html

    r119992 r130689  
    3030        window.scrollTo(0, 1000);
    3131        if (window.testRunner) {
    32             document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
     32            document.getElementById('layertree').innerText = window.internals.layerTreeAsText(document);
    3333            testRunner.dumpAsText(true);
    3434        }

  • trunk/LayoutTests/compositing/layer-creation/fixed-position-out-of-view.html

    r119992 r130689  
    1919
    2020      window.addEventListener("load", function() {
    21         document.getElementById("layertree").innerText = testRunner.layerTreeAsText();
     21        document.getElementById("layertree").innerText = window.internals.layerTreeAsText(document);
    2222      }, false);
    2323    }

  • trunk/LayoutTests/compositing/layer-creation/fixed-position-under-transform.html

    r119992 r130689  
    3636        window.scrollTo(0, 1000);
    3737        if (window.testRunner) {
    38             document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
     38            document.getElementById('layertree').innerText = window.internals.layerTreeAsText(document);
    3939            testRunner.dumpAsText(true);
    4040        }

  • trunk/LayoutTests/compositing/layer-creation/no-compositing-for-preserve-3d.html

    r119992 r130689  
    3131    var layersResult = document.getElementById('layers');
    3232    if (window.testRunner)
    33       layersResult.innerText = testRunner.layerTreeAsText();
     33      layersResult.innerText = window.internals.layerTreeAsText(document);
    3434   
    3535  }

  • trunk/LayoutTests/compositing/layer-creation/overflow-scroll-overlap.html

    r125789 r130689  
    5050       
    5151        if (window.testRunner) {
    52           document.getElementById('results').innerText = window.testRunner.layerTreeAsText();
     52          document.getElementById('results').innerText = window.internals.layerTreeAsText(document);
    5353          testRunner.notifyDone();
    5454        }

  • trunk/LayoutTests/compositing/layer-creation/overlap-animation.html

    r119992 r130689  
    4646    {
    4747      if (window.testRunner) {
    48         document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     48        document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    4949        testRunner.notifyDone();
    5050      }

  • trunk/LayoutTests/compositing/layer-creation/overlap-child-layer.html

    r119992 r130689  
    4747    window.addEventListener('load', function() {
    4848        if (window.testRunner) {
    49             document.getElementById("layertree").innerText = testRunner.layerTreeAsText();
     49            document.getElementById("layertree").innerText = window.internals.layerTreeAsText(document);
    5050            testRunner.notifyDone();
    5151        }

  • trunk/LayoutTests/compositing/layer-creation/overlap-clipping.html

    r119992 r130689  
    4444        testRunner.dumpAsText(false);
    4545        window.addEventListener('load', function() {
    46             document.getElementById("layertree").innerText = testRunner.layerTreeAsText();
     46            document.getElementById("layertree").innerText = window.internals.layerTreeAsText(document);
    4747        }, false);
    4848    }

  • trunk/LayoutTests/compositing/layer-creation/overlap-transformed-and-clipped.html

    r119992 r130689  
    5353        testRunner.dumpAsText(true);
    5454        window.addEventListener('load', function() {
    55             document.getElementById("layertree").innerText = testRunner.layerTreeAsText();
     55            document.getElementById("layertree").innerText = window.internals.layerTreeAsText(document);
    5656        }, false);
    5757    }

  • trunk/LayoutTests/compositing/layer-creation/overlap-transformed-layer.html

    r119992 r130689  
    4646        testRunner.dumpAsText(true);
    4747        window.addEventListener('load', function() {
    48             document.getElementById("layertree").innerText = testRunner.layerTreeAsText();
     48            document.getElementById("layertree").innerText = window.internals.layerTreeAsText(document);
    4949        }, false);
    5050    }

  • trunk/LayoutTests/compositing/layer-creation/overlap-transforms.html

    r119992 r130689  
    3232    {
    3333      if (window.testRunner)
    34         document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     34        document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    3535    }
    3636    window.addEventListener('load', testDone, false);

  • trunk/LayoutTests/compositing/layer-creation/rotate3d-overlap.html

    r119992 r130689  
    2323   {
    2424       if (window.testRunner) {
    25          document.getElementById('results').innerText = window.testRunner.layerTreeAsText();
     25         document.getElementById('results').innerText = window.internals.layerTreeAsText(document);
    2626         testRunner.notifyDone();
    2727       }

  • trunk/LayoutTests/compositing/layer-creation/scroll-partial-update.html

    r119992 r130689  
    4747          document.getElementById('scroller').scrollTop = 50;
    4848          if (window.testRunner) {
    49             document.getElementById('results').innerText = testRunner.layerTreeAsText();
     49            document.getElementById('results').innerText = window.internals.layerTreeAsText(document);
    5050            testRunner.notifyDone();
    5151          }

  • trunk/LayoutTests/compositing/layer-creation/spanOverlapsCanvas.html

    r119992 r130689  
    1515                window.testRunner.dumpAsText(true);
    1616                var console = document.getElementById("layeroutput");
    17                 console.innerHTML = window.testRunner.layerTreeAsText();
     17                console.innerHTML = window.internals.layerTreeAsText(document);
    1818            }
    1919            }

  • trunk/LayoutTests/compositing/layer-creation/stacking-context-overlap-nested.html

    r119992 r130689  
    4444      {
    4545          if (window.testRunner) {
    46               document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
     46              document.getElementById('layertree').innerText = window.internals.layerTreeAsText(document);
    4747              testRunner.notifyDone();
    4848          }

  • trunk/LayoutTests/compositing/layer-creation/stacking-context-overlap.html

    r119992 r130689  
    3939    {
    4040        if (window.testRunner) {
    41             document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
     41            document.getElementById('layertree').innerText = window.internals.layerTreeAsText(document);
    4242            testRunner.notifyDone();
    4343        }

  • trunk/LayoutTests/compositing/layer-creation/translatez-overlap.html

    r119992 r130689  
    2222   {
    2323       if (window.testRunner) {
    24          document.getElementById('results').innerText = window.testRunner.layerTreeAsText();
     24         document.getElementById('results').innerText = window.internals.layerTreeAsText(document);
    2525         testRunner.notifyDone();
    2626       }

  • trunk/LayoutTests/compositing/overflow-trumps-transform-style.html

    r119992 r130689  
    2424     
    2525      if (window.testRunner)
    26         results.innerText += testRunner.layerTreeAsText();
     26        results.innerText += window.internals.layerTreeAsText(document);
    2727    }
    2828    window.addEventListener('load', dumpResults, false);

  • trunk/LayoutTests/compositing/overflow/clip-descendents.html

    r119992 r130689  
    4040    function doTest() {
    4141      if (window.testRunner) {
    42         document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     42        document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    4343        testRunner.notifyDone();
    4444      }

  • trunk/LayoutTests/compositing/overflow/content-gains-scrollbars.html

    r119992 r130689  
    5151    if (window.testRunner) {
    5252        testRunner.display(); // Ensure compositor tree is up to date.
    53         document.getElementById("layerTree").innerText = testRunner.layerTreeAsText();
     53        document.getElementById("layerTree").innerText = window.internals.layerTreeAsText(document);
    5454    }
    5555}

  • trunk/LayoutTests/compositing/overflow/content-loses-scrollbars.html

    r119992 r130689  
    5151    if (window.testRunner) {
    5252        testRunner.display(); // Ensure compositor tree is up to date.
    53         document.getElementById("layerTree").innerText = testRunner.layerTreeAsText();
     53        document.getElementById("layerTree").innerText = window.internals.layerTreeAsText(document);
    5454    }
    5555}

  • trunk/LayoutTests/compositing/overflow/overflow-auto-with-touch-no-overflow.html

    r126663 r130689  
    2222    window.addEventListener('load', function() {
    2323      if (window.testRunner)
    24         document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
     24        document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document);
    2525    }, true);
    2626  </script>

  • trunk/LayoutTests/compositing/overflow/overflow-auto-with-touch-toggle.html

    r127620 r130689  
    2727      column.style.height = '1000px';
    2828      if (window.testRunner)
    29         document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
     29        document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document);
    3030    }, true);
    3131  </script>

  • trunk/LayoutTests/compositing/overflow/overflow-auto-with-touch.html

    r126663 r130689  
    2222    window.addEventListener('load', function() {
    2323      if (window.testRunner)
    24         document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
     24        document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document);
    2525    }, true);
    2626  </script>

  • trunk/LayoutTests/compositing/overflow/overflow-hidden-with-touch.html

    r126663 r130689  
    2222    window.addEventListener('load', function() {
    2323      if (window.testRunner)
    24         document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
     24        document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document);
    2525    }, true);
    2626  </script>

  • trunk/LayoutTests/compositing/overflow/overflow-overlay-with-touch-no-overflow.html

    r126663 r130689  
    2222    window.addEventListener('load', function() {
    2323      if (window.testRunner)
    24         document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
     24        document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document);
    2525    }, true);
    2626  </script>

  • trunk/LayoutTests/compositing/overflow/overflow-overlay-with-touch.html

    r126663 r130689  
    2222    window.addEventListener('load', function() {
    2323      if (window.testRunner)
    24         document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
     24        document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document);
    2525    }, true);
    2626  </script>

  • trunk/LayoutTests/compositing/overflow/overflow-scroll-with-touch-no-overflow.html

    r126663 r130689  
    2222    window.addEventListener('load', function() {
    2323      if (window.testRunner)
    24         document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
     24        document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document);
    2525    }, true);
    2626  </script>

  • trunk/LayoutTests/compositing/overflow/overflow-scrollbar-layers.html

    r119992 r130689  
    4646    testRunner.dumpAsText();
    4747    testRunner.display(); // Ensure compositor tree is up to date.
    48     document.getElementById("layerTree").innerText = testRunner.layerTreeAsText();
     48    document.getElementById("layerTree").innerText = window.internals.layerTreeAsText(document);
    4949}
    5050</script>

  • trunk/LayoutTests/compositing/overflow/overflow-visible-with-touch.html

    r126663 r130689  
    2222    window.addEventListener('load', function() {
    2323      if (window.testRunner)
    24         document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
     24        document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document);
    2525    }, true);
    2626  </script>

  • trunk/LayoutTests/compositing/overflow/resize-painting.html

    r119992 r130689  
    2626    {
    2727        if (window.testRunner)
    28           document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     28          document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    2929    }
    3030   

  • trunk/LayoutTests/compositing/overflow/scrolling-content-clip-to-viewport.html

    r126663 r130689  
    3232    window.addEventListener('load', function() {
    3333      if (window.testRunner)
    34         document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
     34        document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document);
    3535    }, true);
    3636  </script>

  • trunk/LayoutTests/compositing/overflow/textarea-scroll-touch.html

    r126663 r130689  
    3333
    3434      if (window.testRunner)
    35         document.getElementById('results').innerText = testRunner.layerTreeAsText();
     35        document.getElementById('results').innerText = window.internals.layerTreeAsText(document);
    3636    }
    3737    window.addEventListener('load', doTest, false);

  • trunk/LayoutTests/compositing/plugins/1x1-composited-plugin.html

    r119992 r130689  
    1919        window.setTimeout(function() {
    2020            if (window.testRunner) {
    21                 var layers = testRunner.layerTreeAsText();
     21                var layers = window.internals.layerTreeAsText(document);
    2222                var result;
    2323                if (layers == "")

  • trunk/LayoutTests/compositing/plugins/large-to-small-composited-plugin.html

    r119992 r130689  
    3333          window.setTimeout(function() {
    3434              if (window.testRunner) {
    35                   var layers = testRunner.layerTreeAsText();
     35                  var layers = window.internals.layerTreeAsText(document);
    3636                  var result;
    3737                  if (layers == "")

  • trunk/LayoutTests/compositing/plugins/no-backing-store.html

    r125101 r130689  
    1818        window.setTimeout(function() {
    1919            if (window.testRunner) {
    20                 document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
     20                document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document);
    2121                testRunner.notifyDone();
    2222            }

  • trunk/LayoutTests/compositing/plugins/small-to-large-composited-plugin.html

    r119992 r130689  
    3333          window.setTimeout(function() {
    3434            if (window.testRunner) {
    35                 document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
     35                document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document);
    3636                testRunner.notifyDone();
    3737            }

  • trunk/LayoutTests/compositing/rtl/rtl-absolute-overflow-scrolled.html

    r119992 r130689  
    5353            if (window.testRunner) {
    5454                if (top == self)
    55                     document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
     55                    document.getElementById('layertree').innerText = window.internals.layerTreeAsText(document);
    5656                testRunner.notifyDone();
    5757            }

  • trunk/LayoutTests/compositing/rtl/rtl-absolute-overflow.html

    r119992 r130689  
    4141        if (window.testRunner) {
    4242            if (top == self)
    43                 document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
     43                document.getElementById('layertree').innerText = window.internals.layerTreeAsText(document);
    4444            testRunner.dumpAsText(true);
    4545        }

  • trunk/LayoutTests/compositing/rtl/rtl-absolute.html

    r119992 r130689  
    4242        if (window.testRunner) {
    4343            if (top == self)
    44                 document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
     44                document.getElementById('layertree').innerText = window.internals.layerTreeAsText(document);
    4545            testRunner.dumpAsText(true);
    4646        }

  • trunk/LayoutTests/compositing/rtl/rtl-fixed-overflow-scrolled.html

    r119992 r130689  
    5151            if (window.testRunner) {
    5252                if (top == self)
    53                     document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
     53                    document.getElementById('layertree').innerText = window.internals.layerTreeAsText(document);
    5454                testRunner.notifyDone();
    5555            }

  • trunk/LayoutTests/compositing/rtl/rtl-fixed-overflow.html

    r119992 r130689  
    4141        if (window.testRunner) {
    4242            if (top == self)
    43                 document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
     43                document.getElementById('layertree').innerText = window.internals.layerTreeAsText(document);
    4444            testRunner.dumpAsText(true);
    4545        }

  • trunk/LayoutTests/compositing/rtl/rtl-fixed.html

    r119992 r130689  
    4141        if (window.testRunner) {
    4242            if (top == self)
    43                 document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
     43                document.getElementById('layertree').innerText = window.internals.layerTreeAsText(document);
    4444            testRunner.dumpAsText(true);
    4545        }

  • trunk/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow-scrolled.html

    r119992 r130689  
    2424    function doTest() {
    2525        if (window.testRunner) {
    26             document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
     26            document.getElementById('layertree').innerText = window.internals.layerTreeAsText(document);
    2727            testRunner.dumpAsText(true);
    2828        }

  • trunk/LayoutTests/compositing/rtl/rtl-iframe-absolute-overflow.html

    r119992 r130689  
    2424    function doTest() {
    2525        if (window.testRunner) {
    26             document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
     26            document.getElementById('layertree').innerText = window.internals.layerTreeAsText(document);
    2727            testRunner.dumpAsText(true);
    2828        }

  • trunk/LayoutTests/compositing/rtl/rtl-iframe-absolute.html

    r119992 r130689  
    2424    function doTest() {
    2525        if (window.testRunner) {
    26             document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
     26            document.getElementById('layertree').innerText = window.internals.layerTreeAsText(document);
    2727            testRunner.dumpAsText(true);
    2828        }

  • trunk/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow-scrolled.html

    r119992 r130689  
    2424    function doTest() {
    2525        if (window.testRunner) {
    26             document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
     26            document.getElementById('layertree').innerText = window.internals.layerTreeAsText(document);
    2727            testRunner.dumpAsText(true);
    2828        }

  • trunk/LayoutTests/compositing/rtl/rtl-iframe-fixed-overflow.html

    r119992 r130689  
    2424    function doTest() {
    2525        if (window.testRunner) {
    26             document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
     26            document.getElementById('layertree').innerText = window.internals.layerTreeAsText(document);
    2727            testRunner.dumpAsText(true);
    2828        }

  • trunk/LayoutTests/compositing/rtl/rtl-iframe-fixed.html

    r119992 r130689  
    2424    function doTest() {
    2525        if (window.testRunner) {
    26             document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
     26            document.getElementById('layertree').innerText = window.internals.layerTreeAsText(document);
    2727            testRunner.dumpAsText(true);
    2828        }

  • trunk/LayoutTests/compositing/rtl/rtl-iframe-relative.html

    r119992 r130689  
    3333    function doTest() {
    3434        if (window.testRunner) {
    35             document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
     35            document.getElementById('layertree').innerText = window.internals.layerTreeAsText(document);
    3636            testRunner.dumpAsText(true);
    3737        }

  • trunk/LayoutTests/compositing/rtl/rtl-relative.html

    r119992 r130689  
    3636        if (window.testRunner) {
    3737            if (top == self)
    38                 document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
     38                document.getElementById('layertree').innerText = window.internals.layerTreeAsText(document);
    3939            testRunner.dumpAsText(true);
    4040        }

  • trunk/LayoutTests/compositing/tiled-layers-hidpi.html

    r120627 r130689  
    1919        function finishTest() {
    2020            setTimeout(function() {
    21                                 document.getElementById('layer-tree').innerText = window.testRunner.layerTreeAsText();
     21                                document.getElementById('layer-tree').innerText = window.internals.layerTreeAsText(document);
    2222                                testRunner.notifyDone();
    2323                        }, 0);

  • trunk/LayoutTests/compositing/tiling/crash-reparent-tiled-layer.html

    r119992 r130689  
    4040                window.setTimeout(function() {
    4141                    if (window.testRunner) {
    42                         document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
     42                        document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document);
    4343                        testRunner.notifyDone();
    4444                    }

  • trunk/LayoutTests/compositing/tiling/huge-layer-add-remove-child.html-disabled

    r119992 r130689  
    4040            window.setTimeout(function() {
    4141                if (window.testRunner)
    42                     result = "First (no children):<br>" + testRunner.layerTreeAsText();
     42                    result = "First (no children):<br>" + window.internals.layerTreeAsText(document);
    4343            }, 0);
    4444           
    … …  
    5252                window.setTimeout(function() {
    5353                    if (window.testRunner)
    54                         result += "<br><br>Second (child added):<br>" + testRunner.layerTreeAsText();
     54                        result += "<br><br>Second (child added):<br>" + window.internals.layerTreeAsText(document);
    5555                }, 0);
    5656            }, 100);
    … …  
    6464                window.setTimeout(function() {
    6565                    if (window.testRunner) {
    66                         result += "<br><br>Third (child removed):<br>" + testRunner.layerTreeAsText();
     66                        result += "<br><br>Third (child removed):<br>" + window.internals.layerTreeAsText(document);
    6767                        document.getElementById('layers').innerHTML = result;
    6868                        testRunner.notifyDone();

  • trunk/LayoutTests/compositing/tiling/huge-layer-img.html-disabled

    r119992 r130689  
    3535            window.setTimeout(function() {
    3636                if (window.testRunner) {
    37                     document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
     37                    document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document);
    3838                    testRunner.notifyDone();
    3939                }

  • trunk/LayoutTests/compositing/tiling/huge-layer-resize.html-disabled

    r119992 r130689  
    5656            testRunner.display();
    5757
    58             return messagePrefix + testRunner.layerTreeAsText();
     58            return messagePrefix + window.internals.layerTreeAsText(document);
    5959        }
    6060     

  • trunk/LayoutTests/compositing/tiling/huge-layer-with-layer-children-resize.html-disabled

    r119992 r130689  
    4646            window.setTimeout(function() {
    4747                if (window.testRunner)
    48                     result = "First (small layer):<br>" + testRunner.layerTreeAsText();
     48                    result = "First (small layer):<br>" + window.internals.layerTreeAsText(document);
    4949            }, 0);
    5050           

  • trunk/LayoutTests/compositing/tiling/huge-layer-with-layer-children.html-disabled

    r119992 r130689  
    4444                window.setTimeout(function() {
    4545                    if (window.testRunner) {
    46                         document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
     46                        document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document);
    4747                        testRunner.notifyDone();
    4848                    }

  • trunk/LayoutTests/compositing/tiling/huge-layer.html-disabled

    r119992 r130689  
    4343                window.setTimeout(function() {
    4444                    if (window.testRunner) {
    45                         document.getElementById('layers').innerHTML = testRunner.layerTreeAsText();
     45                        document.getElementById('layers').innerHTML = window.internals.layerTreeAsText(document);
    4646                        testRunner.notifyDone();
    4747                    }

  • trunk/LayoutTests/compositing/video/video-poster.html

    r119992 r130689  
    1414            {
    1515                if (window.testRunner)
    16                     return testRunner.layerTreeAsText() != "";
     16                    return window.internals.layerTreeAsText(document) != "";
    1717                return false;
    1818            }

  • trunk/LayoutTests/compositing/visibility/layer-visible-content.html

    r119992 r130689  
    4848    {
    4949        if (window.testRunner)
    50             document.getElementById('layer-tree').innerText = testRunner.layerTreeAsText();
     50            document.getElementById('layer-tree').innerText = window.internals.layerTreeAsText(document);
    5151    }
    5252    window.addEventListener('load', dumpLayers, false);

  • trunk/LayoutTests/compositing/visibility/visibility-image-layers-dynamic.html

    r119992 r130689  
    5555    {
    5656      if (window.testRunner)
    57         document.getElementById('layers1').innerText = testRunner.layerTreeAsText();
     57        document.getElementById('layers1').innerText = window.internals.layerTreeAsText(document);
    5858
    5959      window.setTimeout(function() {

  • trunk/LayoutTests/css3/compositing/should-have-compositing-layer.html

    r127162 r130689  
    1414        description("Test to make sure a blend mode creates a compositing layer. Test is successful of render tree shows compositing");
    1515        if (window.testRunner) {
    16             var layers = testRunner.layerTreeAsText();
     16            var layers = window.internals.layerTreeAsText(document);
    1717            if (layers == "")
    1818                testFailed("no compositing layers");

  • trunk/LayoutTests/css3/filters/composited-during-animation-layertree.html

    r119990 r130689  
    7676      function doTest() {
    7777          if (window.testRunner) {
    78               document.getElementById('layer-tree').innerText = testRunner.layerTreeAsText()
     78              document.getElementById('layer-tree').innerText = window.internals.layerTreeAsText(document)
    7979              testRunner.notifyDone();
    8080          }

  • trunk/LayoutTests/css3/filters/composited-during-transition-layertree.html

    r119990 r130689  
    6767      function doTest() {
    6868          if (window.testRunner) {
    69               document.getElementById('layer-tree').innerText = testRunner.layerTreeAsText()
     69              document.getElementById('layer-tree').innerText = window.internals.layerTreeAsText(document)
    7070              testRunner.notifyDone();
    7171          }

  • trunk/LayoutTests/css3/filters/filtered-compositing-descendant.html

    r119990 r130689  
    3131    window.addEventListener('load', function () {
    3232      if (window.testRunner)
    33         document.getElementById('layer-tree').innerText = testRunner.layerTreeAsText();
     33        document.getElementById('layer-tree').innerText = window.internals.layerTreeAsText(document);
    3434    }, false);
    3535  </script>

  • trunk/LayoutTests/css3/filters/should-not-have-compositing-layer.html

    r119990 r130689  
    1414        description("Test to make sure a simple CSS filter does not create a compositing layer. Test is successful of render tree does not show any compositing");
    1515        if (window.testRunner) {
    16             var layers = testRunner.layerTreeAsText();
     16            var layers = window.internals.layerTreeAsText(document);
    1717            if (layers == "")
    1818                testPassed("no compositing layers");

  • trunk/LayoutTests/platform/chromium-android/compositing/layer-creation/overflow-scrolling-touch.html

    r127159 r130689  
    4040    {
    4141      if (window.layoutTestController) {
    42         document.getElementById('layers').innerText = layoutTestController.layerTreeAsText();
     42        document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    4343        layoutTestController.notifyDone();
    4444      }

  • trunk/LayoutTests/platform/chromium/compositing/force-compositing-mode/force-composite-empty.html

    r119992 r130689  
    88      function doTest() {
    99        if (window.testRunner) {
    10           document.getElementById("layertree").innerText = testRunner.layerTreeAsText();
     10          document.getElementById("layertree").innerText = window.internals.layerTreeAsText(document);
    1111          testRunner.dumpAsText();
    1212        }

  • trunk/LayoutTests/platform/chromium/compositing/force-compositing-mode/no-overflow-iframe-layer.html

    r119992 r130689  
    1212      if (window.testRunner) {
    1313        testRunner.dumpAsText(false);
    14         document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
     14        document.getElementById('layertree').innerText = window.internals.layerTreeAsText(document);
    1515      }
    1616    }

  • trunk/LayoutTests/platform/chromium/compositing/force-compositing-mode/overflow-hidden-iframe-layer.html

    r119992 r130689  
    2121      if (window.testRunner) {
    2222        testRunner.dumpAsText(false);
    23         document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
     23        document.getElementById('layertree').innerText = window.internals.layerTreeAsText(document);
    2424      }
    2525    }

  • trunk/LayoutTests/platform/chromium/compositing/force-compositing-mode/overflow-iframe-enter-compositing.html

    r119992 r130689  
    2222      if (window.testRunner) {
    2323        testRunner.dumpAsText(false);
    24         document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
     24        document.getElementById('layertree').innerText = window.internals.layerTreeAsText(document);
    2525      }
    2626    }

  • trunk/LayoutTests/platform/chromium/compositing/force-compositing-mode/overflow-iframe-layer.html

    r119992 r130689  
    1616      if (window.testRunner) {
    1717        testRunner.dumpAsText(false);
    18         document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
     18        document.getElementById('layertree').innerText = window.internals.layerTreeAsText(document);
    1919      }
    2020    }

  • trunk/LayoutTests/platform/chromium/compositing/force-compositing-mode/overflow-iframe-leave-compositing.html

    r119992 r130689  
    2222      if (window.testRunner) {
    2323        testRunner.dumpAsText(false);
    24         document.getElementById('layertree').innerText = testRunner.layerTreeAsText();
     24        document.getElementById('layertree').innerText = window.internals.layerTreeAsText(document);
    2525      }
    2626    }

  • trunk/LayoutTests/platform/mac/compositing/canvas/accelerated-canvas-compositing.html

    r119992 r130689  
    1414
    1515        if (window.testRunner) {
    16             document.getElementById('layers').innerText = testRunner.layerTreeAsText();
     16            document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
    1717            testRunner.notifyDone();
    1818        }

  • trunk/Source/WebCore/ChangeLog

    r130688 r130689  
     12012-10-08  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Move layerTreeAsText to window.internals
     4        https://bugs.webkit.org/show_bug.cgi?id=98690
     5
     6        Reviewed by James Robinson.
     7
     8        Add window.internals.layerTreeAsText(document), and change the tests to use it.
     9        I'll remove testRunner.layerTreeAsText() in a later patch.
     10
     11        * testing/Internals.cpp:
     12        (WebCore::Internals::layerTreeAsText):
     13        * testing/Internals.h:
     14        (Internals):
     15        * testing/Internals.idl:
     16
    1172012-10-08  Jon Lee  <jonlee@apple.com>
    218

  • trunk/Source/WebCore/testing/Internals.cpp

    r130177 r130689  
    12231223}
    12241224
     1225String Internals::layerTreeAsText(Document* document, ExceptionCode& ec) const
     1226{
     1227    if (!document || !document->frame()) {
     1228        ec = INVALID_ACCESS_ERR;
     1229        return String();
     1230    }
     1231   
     1232    return document->frame()->layerTreeAsText();
     1233}
     1234
    12251235void Internals::garbageCollectDocumentResources(Document* document, ExceptionCode& ec) const
    12261236{

  • trunk/Source/WebCore/testing/Internals.h

    r130177 r130689  
    188188    void resumeAnimations(Document*, ExceptionCode&) const;
    189189
     190    String layerTreeAsText(Document*, ExceptionCode&) const;
     191
    190192    void garbageCollectDocumentResources(Document*, ExceptionCode&) const;
    191193

  • trunk/Source/WebCore/testing/Internals.idl

    r130177 r130689  
    158158        void resumeAnimations(in Document document) raises (DOMException);
    159159
     160        DOMString layerTreeAsText(in Document document) raises (DOMException);
     161
    160162        void garbageCollectDocumentResources(in Document document) raises (DOMException);
    161163
Note: See TracChangeset for help on using the changeset viewer.