Changeset 119985 in webkit


Ignore:
Timestamp:
Jun 11, 2012 10:22:07 AM (12 years ago)
Author:
rniwa@webkit.org
Message:

Use testRunner instead of layoutTestController in animations tests
​https://bugs.webkit.org/show_bug.cgi?id=88757

Reviewed by Tony Chang.

  • animations/3d/change-transform-in-end-event.html:
  • animations/3d/replace-filling-transform.html:
  • animations/3d/state-at-end-event-transform.html:
  • animations/3d/transform-origin-vs-functions.html:
  • animations/animation-add-events-in-handler.html:
  • animations/animation-border-overflow.html:
  • animations/animation-controller-drt-api.html:
  • animations/animation-direction-reverse-fill-mode-hardware.html:
  • animations/animation-direction-reverse-fill-mode.html:
  • animations/animation-drt-api-multiple-keyframes.html:
  • animations/animation-drt-api.html:
  • animations/animation-end-event-destroy-renderer.html:
  • animations/animation-end-event-short-iterations.html:
  • animations/animation-hit-test-transform.html:
  • animations/animation-hit-test.html:
  • animations/animation-iteration-event-destroy-renderer.html:
  • animations/animation-matrix-negative-scale-unmatrix.html:
  • animations/animation-on-inline-crash.html:
  • animations/animation-shorthand-overriding.html:
  • animations/animation-shorthand-removed.html:
  • animations/animation-shorthand.html:
  • animations/animation-start-event-destroy-renderer.html:
  • animations/animation-welcome-safari.html:
  • animations/body-removal-crash.html:
  • animations/change-keyframes-name.html:
  • animations/change-transform-style-during-animation.html:
  • animations/combo-transform-translate+scale.html:
  • animations/empty-keyframes.html:
  • animations/fill-mode-forwards.html:
  • animations/fill-mode-iteration-count-non-integer.html:
  • animations/fill-mode-missing-from-to-keyframes.html:
  • animations/fill-mode-multiple-keyframes.html:
  • animations/fill-mode-removed.html:
  • animations/fill-mode-reverse.html:
  • animations/fill-mode-transform.html:
  • animations/fill-mode.html:
  • animations/fill-unset-properties.html:
  • animations/font-size-using-ems.html-disabled:
  • animations/import-crash.html:
  • animations/keyframe-timing-functions-transform.html:
  • animations/keyframe-timing-functions2.html:
  • animations/keyframes-iteration-count-non-integer.html:
  • animations/longhand-timing-function.html:
  • animations/missing-from-to-transforms.html:
  • animations/missing-from-to.html:
  • animations/pause-crash.html:
  • animations/resources/animation-test-helpers.js:

(checkExpectedValue):
(endTest):

  • animations/state-at-end-event.html:
  • animations/suspend-resume-animation-events.html:
  • animations/suspend-transform-animation.html:
  • animations/transition-and-animation-3.html:
  • animations/unanimated-style.html:
Location:
trunk/LayoutTests
Files:
51 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r119984 r119985  
     12012-06-11  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Use testRunner instead of layoutTestController in animations tests
     4        https://bugs.webkit.org/show_bug.cgi?id=88757
     5
     6        Reviewed by Tony Chang.
     7
     8        * animations/3d/change-transform-in-end-event.html:
     9        * animations/3d/replace-filling-transform.html:
     10        * animations/3d/state-at-end-event-transform.html:
     11        * animations/3d/transform-origin-vs-functions.html:
     12        * animations/animation-add-events-in-handler.html:
     13        * animations/animation-border-overflow.html:
     14        * animations/animation-controller-drt-api.html:
     15        * animations/animation-direction-reverse-fill-mode-hardware.html:
     16        * animations/animation-direction-reverse-fill-mode.html:
     17        * animations/animation-drt-api-multiple-keyframes.html:
     18        * animations/animation-drt-api.html:
     19        * animations/animation-end-event-destroy-renderer.html:
     20        * animations/animation-end-event-short-iterations.html:
     21        * animations/animation-hit-test-transform.html:
     22        * animations/animation-hit-test.html:
     23        * animations/animation-iteration-event-destroy-renderer.html:
     24        * animations/animation-matrix-negative-scale-unmatrix.html:
     25        * animations/animation-on-inline-crash.html:
     26        * animations/animation-shorthand-overriding.html:
     27        * animations/animation-shorthand-removed.html:
     28        * animations/animation-shorthand.html:
     29        * animations/animation-start-event-destroy-renderer.html:
     30        * animations/animation-welcome-safari.html:
     31        * animations/body-removal-crash.html:
     32        * animations/change-keyframes-name.html:
     33        * animations/change-transform-style-during-animation.html:
     34        * animations/combo-transform-translate+scale.html:
     35        * animations/empty-keyframes.html:
     36        * animations/fill-mode-forwards.html:
     37        * animations/fill-mode-iteration-count-non-integer.html:
     38        * animations/fill-mode-missing-from-to-keyframes.html:
     39        * animations/fill-mode-multiple-keyframes.html:
     40        * animations/fill-mode-removed.html:
     41        * animations/fill-mode-reverse.html:
     42        * animations/fill-mode-transform.html:
     43        * animations/fill-mode.html:
     44        * animations/fill-unset-properties.html:
     45        * animations/font-size-using-ems.html-disabled:
     46        * animations/import-crash.html:
     47        * animations/keyframe-timing-functions-transform.html:
     48        * animations/keyframe-timing-functions2.html:
     49        * animations/keyframes-iteration-count-non-integer.html:
     50        * animations/longhand-timing-function.html:
     51        * animations/missing-from-to-transforms.html:
     52        * animations/missing-from-to.html:
     53        * animations/pause-crash.html:
     54        * animations/resources/animation-test-helpers.js:
     55        (checkExpectedValue):
     56        (endTest):
     57        * animations/state-at-end-event.html:
     58        * animations/suspend-resume-animation-events.html:
     59        * animations/suspend-transform-animation.html:
     60        * animations/transition-and-animation-3.html:
     61        * animations/unanimated-style.html:
     62
    1632012-06-11  David Barr  <davidbarr@chromium.org>
    264

  • trunk/LayoutTests/animations/3d/change-transform-in-end-event.html

    r52694 r119985  
    4747    {
    4848      document.getElementById('tester').style.webkitTransform = 'translateX(150px)';
    49       if (window.layoutTestController)
    50         layoutTestController.notifyDone();
     49      if (window.testRunner)
     50        testRunner.notifyDone();
    5151    }
    5252   
    5353    function startTest()
    5454    {
    55       if (window.layoutTestController)
    56         layoutTestController.waitUntilDone();
     55      if (window.testRunner)
     56        testRunner.waitUntilDone();
    5757
    5858      document.getElementById('tester').addEventListener('webkitAnimationEnd', testEnded, false);

  • trunk/LayoutTests/animations/3d/replace-filling-transform.html

    r85338 r119985  
    5757                result.innerHTML = "FAIL - final state was " + computedValue + " expected " + expectedValue;
    5858
    59             if (window.layoutTestController)
    60                 layoutTestController.notifyDone();
     59            if (window.testRunner)
     60                testRunner.notifyDone();
    6161        }
    6262
    … …  
    7777        }
    7878       
    79         if (window.layoutTestController) {
    80             layoutTestController.dumpAsText(true);
    81             layoutTestController.waitUntilDone();
     79        if (window.testRunner) {
     80            testRunner.dumpAsText(true);
     81            testRunner.waitUntilDone();
    8282        }
    8383

  • trunk/LayoutTests/animations/3d/state-at-end-event-transform.html

    r52694 r119985  
    4343    function testEnded()
    4444    {
    45       if (window.layoutTestController)
    46         layoutTestController.notifyDone();
     45      if (window.testRunner)
     46        testRunner.notifyDone();
    4747    }
    4848   
    4949    function startTest()
    5050    {
    51       if (window.layoutTestController)
    52         layoutTestController.waitUntilDone();
     51      if (window.testRunner)
     52        testRunner.waitUntilDone();
    5353
    5454      document.getElementById('tester').addEventListener('webkitAnimationEnd', testEnded, false);

  • trunk/LayoutTests/animations/3d/transform-origin-vs-functions.html

    r81613 r119985  
    5656   
    5757    <script type="text/javascript" charset="utf-8">
    58       if (window.layoutTestController) {
    59         layoutTestController.dumpAsText();
    60         layoutTestController.waitUntilDone();
     58      if (window.testRunner) {
     59        testRunner.dumpAsText();
     60        testRunner.waitUntilDone();
    6161      }
    6262
    … …  
    100100              resultEntries.sort();
    101101              document.getElementById('result').innerHTML = resultEntries.join("");
    102               if (window.layoutTestController)
    103                   layoutTestController.notifyDone();
     102              if (window.testRunner)
     103                  testRunner.notifyDone();
    104104          }
    105105      }

  • trunk/LayoutTests/animations/animation-add-events-in-handler.html

    r76708 r119985  
    11<script>
    2 if (window.layoutTestController) {
    3     layoutTestController.dumpAsText();
    4     layoutTestController.waitUntilDone();
     2if (window.testRunner) {
     3    testRunner.dumpAsText();
     4    testRunner.waitUntilDone();
    55}
    66
    … …  
    1111    if (total == 500) {
    1212        document.getElementById("results").innerHTML = "PASS: Adding animation events in the handler did not crash.";
    13         if (window.layoutTestController)
    14           layoutTestController.notifyDone();
     13        if (window.testRunner)
     14          testRunner.notifyDone();
    1515    }
    1616}

  • trunk/LayoutTests/animations/animation-border-overflow.html

    r106672 r119985  
    2020    <script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
    2121    <script type="text/javascript" charset="utf-8">
    22     if (window.layoutTestController)
    23         layoutTestController.dumpAsText();
     22    if (window.testRunner)
     23        testRunner.dumpAsText();
    2424
    2525    const expectedValues = [

  • trunk/LayoutTests/animations/animation-controller-drt-api.html

    r39711 r119985  
    5151    function sample0() {
    5252      var expected = 4;
    53       var current = layoutTestController.numberOfActiveAnimations();
     53      var current = testRunner.numberOfActiveAnimations();
    5454      if (current == expected)
    5555        document.getElementById('result0').innerHTML = "Number of active animations at 0s is (" + current + ") as expected";
    … …  
    6060    function sample1() {
    6161      var expected = 4;
    62       var current = layoutTestController.numberOfActiveAnimations();
     62      var current = testRunner.numberOfActiveAnimations();
    6363      if (current == expected)
    6464        document.getElementById('result1').innerHTML = "Number of active animations at 1s is (" + current + ") as expected";
    … …  
    6666        document.getElementById('result1').innerHTML = "Number of active animations at 1s is (" + current + ") but was expecting (" + expected + ")";
    6767     
    68       layoutTestController.notifyDone();
     68      testRunner.notifyDone();
    6969    }
    7070   
    7171    function startTest() {
    72       if (window.layoutTestController) {
    73         layoutTestController.dumpAsText();
    74         layoutTestController.waitUntilDone();
     72      if (window.testRunner) {
     73        testRunner.dumpAsText();
     74        testRunner.waitUntilDone();
    7575       
    7676        var target = document.getElementById('target');

  • trunk/LayoutTests/animations/animation-direction-reverse-fill-mode-hardware.html

    r115540 r119985  
    4444    var result = "";
    4545
    46     if (window.layoutTestController) {
    47         layoutTestController.dumpAsText();
    48         layoutTestController.waitUntilDone();
     46    if (window.testRunner) {
     47        testRunner.dumpAsText();
     48        testRunner.waitUntilDone();
    4949    }
    5050
    … …  
    6969        document.getElementById('result').innerHTML = result;
    7070
    71         if (window.layoutTestController)
    72             layoutTestController.notifyDone();
     71        if (window.testRunner)
     72            testRunner.notifyDone();
    7373    }
    7474   

  • trunk/LayoutTests/animations/animation-direction-reverse-fill-mode.html

    r115540 r119985  
    5757    var result = "";
    5858
    59     if (window.layoutTestController) {
    60         layoutTestController.dumpAsText();
    61         layoutTestController.waitUntilDone();
     59    if (window.testRunner) {
     60        testRunner.dumpAsText();
     61        testRunner.waitUntilDone();
    6262    }
    6363
    … …  
    8282        document.getElementById('result').innerHTML = result;
    8383
    84         if (window.layoutTestController)
    85             layoutTestController.notifyDone();
     84        if (window.testRunner)
     85            testRunner.notifyDone();
    8686    }
    8787

  • trunk/LayoutTests/animations/animation-drt-api-multiple-keyframes.html

    r103816 r119985  
    2424   <script src="resources/animation-test-helpers.js"></script>
    2525   <script>
    26      if (window.layoutTestController) {
    27        layoutTestController.waitUntilDone();
    28        layoutTestController.dumpAsText();
     26     if (window.testRunner) {
     27       testRunner.waitUntilDone();
     28       testRunner.dumpAsText();
    2929     }
    3030   
    3131    function animationStarted()
    3232    {
    33       if (window.layoutTestController) {
    34         var paused = layoutTestController.pauseAnimationAtTimeOnElementWithId("anim", 1, "target");
     33      if (window.testRunner) {
     34        var paused = testRunner.pauseAnimationAtTimeOnElementWithId("anim", 1, "target");
    3535        var result;
    3636        if (paused)
    … …  
    4040
    4141        document.getElementById('results').innerText = result;
    42         layoutTestController.notifyDone();
     42        testRunner.notifyDone();
    4343      } else
    4444        document.getElementById('results').innerText = "This test requires DRT";

  • trunk/LayoutTests/animations/animation-drt-api.html

    r84961 r119985  
    2626  <script src="resources/animation-test-helpers.js"></script>
    2727  <script>
    28     if (window.layoutTestController) {
    29       layoutTestController.waitUntilDone();
    30       layoutTestController.dumpAsText();
     28    if (window.testRunner) {
     29      testRunner.waitUntilDone();
     30      testRunner.dumpAsText();
    3131    }
    3232
    3333    function animationStarted()
    3434    {
    35       if (window.layoutTestController) {
    36         var paused = layoutTestController.pauseAnimationAtTimeOnElementWithId("bounce", 1.0, "target");
     35      if (window.testRunner) {
     36        var paused = testRunner.pauseAnimationAtTimeOnElementWithId("bounce", 1.0, "target");
    3737        var result = "";
    3838        if (paused)
    … …  
    4242
    4343        document.getElementById('results').innerText = result;
    44         layoutTestController.notifyDone();
     44        testRunner.notifyDone();
    4545      } else
    4646        document.getElementById('results').innerText = "This test requires DRT";

  • trunk/LayoutTests/animations/animation-end-event-destroy-renderer.html

    r38969 r119985  
    1717  </style>
    1818  <script type="text/javascript" charset="utf-8">
    19     if (window.layoutTestController) {
    20         layoutTestController.dumpAsText();
    21         layoutTestController.waitUntilDone();
     19    if (window.testRunner) {
     20        testRunner.dumpAsText();
     21        testRunner.waitUntilDone();
    2222    }
    2323
    … …  
    3232        document.getElementById('results').innerHTML = 'Did not crash, so PASSED';
    3333
    34         if (window.layoutTestController)
    35           layoutTestController.notifyDone();
     34        if (window.testRunner)
     35          testRunner.notifyDone();
    3636      }
    3737    }

  • trunk/LayoutTests/animations/animation-end-event-short-iterations.html

    r67797 r119985  
    2121  </style>
    2222  <script>
    23     if (window.layoutTestController) {
    24         layoutTestController.dumpAsText();
    25         layoutTestController.waitUntilDone();
     23    if (window.testRunner) {
     24        testRunner.dumpAsText();
     25        testRunner.waitUntilDone();
    2626    }
    2727 
    … …  
    3030        document.addEventListener('webkitAnimationEnd', function() {
    3131            document.getElementById('result').innerHTML = 'PASS: got webkitAnimationEnd event';     
    32             if (window.layoutTestController)
    33                 layoutTestController.notifyDone();
     32            if (window.testRunner)
     33                testRunner.notifyDone();
    3434        }, false);
    3535       

  • trunk/LayoutTests/animations/animation-hit-test-transform.html

    r84872 r119985  
    5454        function doTest()
    5555        {
    56             if (window.layoutTestController) {
    57                 if (!layoutTestController.pauseAnimationAtTimeOnElementWithId("anim", 2.0, "target"))
     56            if (window.testRunner) {
     57                if (!testRunner.pauseAnimationAtTimeOnElementWithId("anim", 2.0, "target"))
    5858                    throw("Transition is not running");
    5959       
    6060                checkResults();
    61                 layoutTestController.notifyDone();
     61                testRunner.notifyDone();
    6262            }
    6363            else {
    … …  
    6868        function startTest()
    6969        {
    70             if (window.layoutTestController) {
    71                 layoutTestController.dumpAsText();
    72                 layoutTestController.waitUntilDone();
     70            if (window.testRunner) {
     71                testRunner.dumpAsText();
     72                testRunner.waitUntilDone();
    7373            }
    7474     

  • trunk/LayoutTests/animations/animation-hit-test.html

    r84872 r119985  
    5454        function doTest()
    5555        {
    56             if (window.layoutTestController) {
    57                 if (!layoutTestController.pauseAnimationAtTimeOnElementWithId("anim", 2.0, "target"))
     56            if (window.testRunner) {
     57                if (!testRunner.pauseAnimationAtTimeOnElementWithId("anim", 2.0, "target"))
    5858                    throw("Transition is not running");
    5959       
    6060                checkResults();
    61                 layoutTestController.notifyDone();
     61                testRunner.notifyDone();
    6262            }
    6363            else {
    … …  
    6868        function startTest()
    6969        {
    70             if (window.layoutTestController) {
    71                 layoutTestController.dumpAsText();
    72                 layoutTestController.waitUntilDone();
     70            if (window.testRunner) {
     71                testRunner.dumpAsText();
     72                testRunner.waitUntilDone();
    7373            }
    7474     

  • trunk/LayoutTests/animations/animation-iteration-event-destroy-renderer.html

    r39059 r119985  
    1818  </style>
    1919  <script type="text/javascript" charset="utf-8">
    20     if (window.layoutTestController) {
    21         layoutTestController.dumpAsText();
    22         layoutTestController.waitUntilDone();
     20    if (window.testRunner) {
     21        testRunner.dumpAsText();
     22        testRunner.waitUntilDone();
    2323    }
    2424
    … …  
    3333        document.getElementById('results').innerHTML = 'Did not crash, so PASSED';
    3434
    35         if (window.layoutTestController)
    36           layoutTestController.notifyDone();
     35        if (window.testRunner)
     36          testRunner.notifyDone();
    3737      }
    3838    }

  • trunk/LayoutTests/animations/animation-matrix-negative-scale-unmatrix.html

    r93150 r119985  
    2323        </style>
    2424        <script type="text/javascript" charset="utf-8">
    25             if (window.layoutTestController) {
    26                 layoutTestController.dumpAsText();
    27                 layoutTestController.waitUntilDone();
     25            if (window.testRunner) {
     26                testRunner.dumpAsText();
     27                testRunner.waitUntilDone();
    2828            }
    2929
    … …  
    4040
    4141                document.getElementById('result').innerHTML = result;
    42                 if (window.layoutTestController)
    43                     layoutTestController.notifyDone();
     42                if (window.testRunner)
     43                    testRunner.notifyDone();
    4444            }
    4545

  • trunk/LayoutTests/animations/animation-on-inline-crash.html

    r74007 r119985  
    1010</style>
    1111<script type="text/javascript" charset="utf-8">
    12     if (window.layoutTestController) {
    13         layoutTestController.dumpAsText();
    14         layoutTestController.waitUntilDone();
     12    if (window.testRunner) {
     13        testRunner.dumpAsText();
     14        testRunner.waitUntilDone();
    1515    }
    1616   
    … …  
    1818    {
    1919        window.setTimeout(function() {
    20             if (window.layoutTestController)
    21                 layoutTestController.notifyDone();
     20            if (window.testRunner)
     21                testRunner.notifyDone();
    2222        }, 50);
    2323    }

  • trunk/LayoutTests/animations/animation-shorthand-overriding.html

    r109610 r119985  
    3030</style>
    3131  <script type="text/javascript" charset="utf-8">
    32     if (window.layoutTestController)
    33         layoutTestController.dumpAsText();
     32    if (window.testRunner)
     33        testRunner.dumpAsText();
    3434 
    3535    const kProperties = [

  • trunk/LayoutTests/animations/animation-shorthand-removed.html

    r59111 r119985  
    1212</style>
    1313  <script type="text/javascript" charset="utf-8">
    14     if (window.layoutTestController) {
    15         layoutTestController.dumpAsText();
    16         layoutTestController.waitUntilDone();
     14    if (window.testRunner) {
     15        testRunner.dumpAsText();
     16        testRunner.waitUntilDone();
    1717    }
    1818
    … …  
    9191      var results = document.getElementById('result');
    9292      results.innerHTML = resultsString;
    93       if (window.layoutTestController)
    94           layoutTestController.notifyDone();
     93      if (window.testRunner)
     94          testRunner.notifyDone();
    9595    }
    9696

  • trunk/LayoutTests/animations/animation-shorthand.html

    r67032 r119985  
    4242</style>
    4343  <script type="text/javascript" charset="utf-8">
    44     if (window.layoutTestController)
    45         layoutTestController.dumpAsText();
     44    if (window.testRunner)
     45        testRunner.dumpAsText();
    4646 
    4747    const kProperties = [

  • trunk/LayoutTests/animations/animation-start-event-destroy-renderer.html

    r39059 r119985  
    1717  </style>
    1818  <script type="text/javascript" charset="utf-8">
    19     if (window.layoutTestController) {
    20         layoutTestController.dumpAsText();
    21         layoutTestController.waitUntilDone();
     19    if (window.testRunner) {
     20        testRunner.dumpAsText();
     21        testRunner.waitUntilDone();
    2222    }
    2323
    … …  
    3232        document.getElementById('results').innerHTML = 'Did not crash, so PASSED';
    3333
    34         if (window.layoutTestController)
    35           layoutTestController.notifyDone();
     34        if (window.testRunner)
     35          testRunner.notifyDone();
    3636      }
    3737    }

  • trunk/LayoutTests/animations/animation-welcome-safari.html

    r111639 r119985  
    9595
    9696<script type="text/javascript" charset="utf-8">
    97    if (window.layoutTestController) {
    98         layoutTestController.dumpAsText();
    99         layoutTestController.waitUntilDone();
     97   if (window.testRunner) {
     98        testRunner.dumpAsText();
     99        testRunner.waitUntilDone();
    100100    }
    101101
    … …  
    117117
    118118    document.addEventListener("webkitAnimationEnd", function(event) {
    119         if (window.layoutTestController)
    120             layoutTestController.notifyDone();
     119        if (window.testRunner)
     120            testRunner.notifyDone();
    121121    }, false);
    122122

  • trunk/LayoutTests/animations/body-removal-crash.html

    r81613 r119985  
    4040  document.getElementById("b").parentNode.insertBefore(element, document.getElementById("b").nextSibling);
    4141 
    42   if (window.layoutTestController)
    43       layoutTestController.notifyDone();
     42  if (window.testRunner)
     43      testRunner.notifyDone();
    4444}
    4545
    46 if (window.layoutTestController) {
    47     layoutTestController.dumpAsText();
    48     layoutTestController.waitUntilDone();
     46if (window.testRunner) {
     47    testRunner.dumpAsText();
     48    testRunner.waitUntilDone();
    4949}
    5050

  • trunk/LayoutTests/animations/change-keyframes-name.html

    r84872 r119985  
    5858    function setup()
    5959    {
    60         if (window.layoutTestController) {
    61           layoutTestController.dumpAsText();
    62           layoutTestController.waitUntilDone();
    63           if (layoutTestController.pauseAnimationAtTimeOnElementWithId("bar", 0.5, "box"))
     60        if (window.testRunner) {
     61          testRunner.dumpAsText();
     62          testRunner.waitUntilDone();
     63          if (testRunner.pauseAnimationAtTimeOnElementWithId("bar", 0.5, "box"))
    6464              document.getElementById("pre-result").innerHTML = "FAIL: animation is running";
    6565          else

  • trunk/LayoutTests/animations/change-transform-style-during-animation.html

    r116786 r119985  
    3838   <script src="resources/animation-test-helpers.js"></script>
    3939   <script>
    40      if (window.layoutTestController) {
    41        layoutTestController.dumpAsText();
    42        layoutTestController.waitUntilDone();
     40     if (window.testRunner) {
     41       testRunner.dumpAsText();
     42       testRunner.waitUntilDone();
    4343     }
    4444
    … …  
    5555       }
    5656       document.getElementById('result').innerHTML = result;
    57        layoutTestController.notifyDone();
     57       testRunner.notifyDone();
    5858     }
    5959

  • trunk/LayoutTests/animations/combo-transform-translate+scale.html

    r53502 r119985  
    2121  </style>
    2222  <script type="text/javascript" charset="utf-8">
    23     if (window.layoutTestController) {
    24       layoutTestController.dumpAsText();
    25       layoutTestController.waitUntilDone();
     23    if (window.testRunner) {
     24      testRunner.dumpAsText();
     25      testRunner.waitUntilDone();
    2626    }
    2727   
    … …  
    5252        if (numSnapshots == 2) {
    5353            document.getElementById('result').innerHTML = result || "PASS";
    54             if (window.layoutTestController)
    55                 layoutTestController.notifyDone();
     54            if (window.testRunner)
     55                testRunner.notifyDone();
    5656        }
    5757    }

  • trunk/LayoutTests/animations/empty-keyframes.html

    r38776 r119985  
    1919  </style>
    2020  <script type="text/javascript" charset="utf-8">
    21     if (window.layoutTestController)
    22         layoutTestController.dumpAsText();
     21    if (window.testRunner)
     22        testRunner.dumpAsText();
    2323  </script>
    2424</head>

  • trunk/LayoutTests/animations/fill-mode-forwards.html

    r117216 r119985  
    22<head>
    33<script>
    4     if (window.layoutTestController) {
    5         layoutTestController.dumpAsText();
    6         layoutTestController.waitUntilDone();
     4    if (window.testRunner) {
     5        testRunner.dumpAsText();
     6        testRunner.waitUntilDone();
    77    }
    88
    … …  
    2727                result.innerHTML = "PASS - Test working";
    2828
    29             if (window.layoutTestController)
    30                 layoutTestController.notifyDone();
     29            if (window.testRunner)
     30                testRunner.notifyDone();
    3131        }
    3232    }

  • trunk/LayoutTests/animations/fill-mode-iteration-count-non-integer.html

    r110588 r119985  
    6262    var result = "";
    6363
    64     if (window.layoutTestController) {
    65         layoutTestController.dumpAsText();
    66         layoutTestController.waitUntilDone();
     64    if (window.testRunner) {
     65        testRunner.dumpAsText();
     66        testRunner.waitUntilDone();
    6767    }
    6868
    … …  
    8989        document.getElementById('result').innerHTML = result;
    9090
    91         if (window.layoutTestController)
    92             layoutTestController.notifyDone();
     91        if (window.testRunner)
     92            testRunner.notifyDone();
    9393    }
    9494

  • trunk/LayoutTests/animations/fill-mode-missing-from-to-keyframes.html

    r67098 r119985  
    104104    var result = "";
    105105
    106     if (window.layoutTestController) {
    107         layoutTestController.dumpAsText();
    108         layoutTestController.waitUntilDone();
     106    if (window.testRunner) {
     107        testRunner.dumpAsText();
     108        testRunner.waitUntilDone();
    109109    }
    110110
    … …  
    131131        document.getElementById('result').innerHTML = result;
    132132
    133         if (window.layoutTestController)
    134             layoutTestController.notifyDone();
     133        if (window.testRunner)
     134            testRunner.notifyDone();
    135135    }
    136136

  • trunk/LayoutTests/animations/fill-mode-multiple-keyframes.html

    r67098 r119985  
    7777    var result = "";
    7878
    79     if (window.layoutTestController) {
    80         layoutTestController.dumpAsText();
    81         layoutTestController.waitUntilDone();
     79    if (window.testRunner) {
     80        testRunner.dumpAsText();
     81        testRunner.waitUntilDone();
    8282    }
    8383
    … …  
    104104        document.getElementById('result').innerHTML = result;
    105105
    106         if (window.layoutTestController)
    107             layoutTestController.notifyDone();
     106        if (window.testRunner)
     107            testRunner.notifyDone();
    108108    }
    109109

  • trunk/LayoutTests/animations/fill-mode-removed.html

    r55576 r119985  
    4949    ];
    5050 
    51     if (window.layoutTestController) {
    52         layoutTestController.dumpAsText();
    53         layoutTestController.waitUntilDone();
     51    if (window.testRunner) {
     52        testRunner.dumpAsText();
     53        testRunner.waitUntilDone();
    5454    }
    5555 
    … …  
    7878        document.getElementById('result').innerHTML = result;
    7979
    80         if (window.layoutTestController)
    81             layoutTestController.notifyDone();
     80        if (window.testRunner)
     81            testRunner.notifyDone();
    8282    }
    8383 

  • trunk/LayoutTests/animations/fill-mode-reverse.html

    r107162 r119985  
    5959    var result = "";
    6060
    61     if (window.layoutTestController) {
    62         layoutTestController.dumpAsText();
    63         layoutTestController.waitUntilDone();
     61    if (window.testRunner) {
     62        testRunner.dumpAsText();
     63        testRunner.waitUntilDone();
    6464    }
    6565
    … …  
    8686        document.getElementById('result').innerHTML = result;
    8787
    88         if (window.layoutTestController)
    89             layoutTestController.notifyDone();
     88        if (window.testRunner)
     89            testRunner.notifyDone();
    9090    }
    9191

  • trunk/LayoutTests/animations/fill-mode-transform.html

    r55601 r119985  
    5959    var result = "";
    6060
    61     if (window.layoutTestController) {
    62         layoutTestController.dumpAsText();
    63         layoutTestController.waitUntilDone();
     61    if (window.testRunner) {
     62        testRunner.dumpAsText();
     63        testRunner.waitUntilDone();
    6464    }
    6565
    … …  
    8787        document.getElementById('result').innerHTML = result;
    8888
    89         if (window.layoutTestController)
    90             layoutTestController.notifyDone();
     89        if (window.testRunner)
     90            testRunner.notifyDone();
    9191    }
    9292   

  • trunk/LayoutTests/animations/fill-mode.html

    r55576 r119985  
    5858    var result = "";
    5959
    60     if (window.layoutTestController) {
    61         layoutTestController.dumpAsText();
    62         layoutTestController.waitUntilDone();
     60    if (window.testRunner) {
     61        testRunner.dumpAsText();
     62        testRunner.waitUntilDone();
    6363    }
    6464
    … …  
    8585        document.getElementById('result').innerHTML = result;
    8686
    87         if (window.layoutTestController)
    88             layoutTestController.notifyDone();
     87        if (window.testRunner)
     88            testRunner.notifyDone();
    8989    }
    9090

  • trunk/LayoutTests/animations/fill-unset-properties.html

    r67032 r119985  
    2323</style>
    2424  <script type="text/javascript" charset="utf-8">
    25     if (window.layoutTestController)
    26         layoutTestController.dumpAsText();
     25    if (window.testRunner)
     26        testRunner.dumpAsText();
    2727 
    2828    const kExpectedResults = [

  • trunk/LayoutTests/animations/font-size-using-ems.html-disabled

    r37513 r119985  
    2929    </style>
    3030    <script type="text/javascript" charset="utf-8">
    31     if (window.layoutTestController) {
    32         layoutTestController.dumpAsText();
    33         layoutTestController.waitUntilDone();
     31    if (window.testRunner) {
     32        testRunner.dumpAsText();
     33        testRunner.waitUntilDone();
    3434    }
    3535   
    … …  
    6262        window.setTimeout(function() {
    6363            document.getElementById('result').innerHTML = result;
    64             if (window.layoutTestController)
    65                 layoutTestController.notifyDone();
     64            if (window.testRunner)
     65                testRunner.notifyDone();
    6666        }, 400);
    6767    }

  • trunk/LayoutTests/animations/import-crash.html

    r37073 r119985  
    2121    </style>
    2222    <script type="text/javascript" charset="utf-8">
    23     if (window.layoutTestController)
    24         layoutTestController.dumpAsText();
     23    if (window.testRunner)
     24        testRunner.dumpAsText();
    2525  </script>
    2626</head>

  • trunk/LayoutTests/animations/keyframes-iteration-count-non-integer.html

    r110588 r119985  
    3131    <script type="text/javascript" charset="utf-8">
    3232
    33     if (window.layoutTestController) {
    34         layoutTestController.dumpAsText();
    35         layoutTestController.waitUntilDone();
     33    if (window.testRunner) {
     34        testRunner.dumpAsText();
     35        testRunner.waitUntilDone();
    3636    }
    3737   
    … …  
    4444        document.getElementById('result').innerHTML = result;
    4545
    46         if (window.layoutTestController)
    47             layoutTestController.notifyDone();
     46        if (window.testRunner)
     47            testRunner.notifyDone();
    4848    }, false);
    4949   

  • trunk/LayoutTests/animations/longhand-timing-function.html

    r84872 r119985  
    2727    <script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
    2828    <script type="text/javascript" charset="utf-8">
    29         if (window.layoutTestController)
    30             layoutTestController.waitUntilDone();
     29        if (window.testRunner)
     30            testRunner.waitUntilDone();
    3131
    3232          const expectedValues = [

  • trunk/LayoutTests/animations/missing-from-to-transforms.html

    r84872 r119985  
    9090
    9191    runAnimationTest(expectedValues, function() {
    92       if (window.layoutTestController) {
    93           if (layoutTestController.pauseAnimationAtTimeOnElementWithId("anim5", 0.1, "box5"))
     92      if (window.testRunner) {
     93          if (testRunner.pauseAnimationAtTimeOnElementWithId("anim5", 0.1, "box5"))
    9494              result += "FAIL - box5 animation was running<br>";
    9595          else

  • trunk/LayoutTests/animations/missing-from-to.html

    r84872 r119985  
    8989
    9090    runAnimationTest(expectedValues, function() {
    91       if (window.layoutTestController) {
    92           if (layoutTestController.pauseAnimationAtTimeOnElementWithId("anim5", 0.1, "box5"))
     91      if (window.testRunner) {
     92          if (testRunner.pauseAnimationAtTimeOnElementWithId("anim5", 0.1, "box5"))
    9393              result += "FAIL - box5 animation was running<br>";
    9494          else

  • trunk/LayoutTests/animations/pause-crash.html

    r94471 r119985  
    1919  </style>
    2020  <script type="text/javascript" charset="utf-8">
    21     if (window.layoutTestController) {
    22         layoutTestController.dumpAsText();
    23         layoutTestController.waitUntilDone();
     21    if (window.testRunner) {
     22        testRunner.dumpAsText();
     23        testRunner.waitUntilDone();
    2424    }
    2525
    … …  
    3232                setTimeout(function() {
    3333                    document.getElementById('results').innerHTML = 'Did not crash, so PASSED';
    34                     if (window.layoutTestController)
    35                         layoutTestController.notifyDone();
     34                    if (window.testRunner)
     35                        testRunner.notifyDone();
    3636                }, 50);
    3737            }, 50);

  • trunk/LayoutTests/animations/resources/animation-test-helpers.js

    r115540 r119985  
    156156    }
    157157
    158     if (animationName && hasPauseAnimationAPI && !layoutTestController.pauseAnimationAtTimeOnElementWithId(animationName, time, elementId)) {
     158    if (animationName && hasPauseAnimationAPI && !testRunner.pauseAnimationAtTimeOnElementWithId(animationName, time, elementId)) {
    159159        result += "FAIL - animation \"" + animationName + "\" is not running" + "<br>";
    160160        return;
    161161    }
    162162   
    163     if (compareElements && !element2Static && animationName && hasPauseAnimationAPI && !layoutTestController.pauseAnimationAtTimeOnElementWithId(animationName, time, elementId2)) {
     163    if (compareElements && !element2Static && animationName && hasPauseAnimationAPI && !testRunner.pauseAnimationAtTimeOnElementWithId(animationName, time, elementId2)) {
    164164        result += "FAIL - animation \"" + animationName + "\" is not running" + "<br>";
    165165        return;
    … …  
    273273    document.getElementById('result').innerHTML = result;
    274274
    275     if (window.layoutTestController)
    276         layoutTestController.notifyDone();
     275    if (window.testRunner)
     276        testRunner.notifyDone();
    277277}
    278278
    … …  
    320320function runAnimationTest(expected, callback, event, disablePauseAnimationAPI, doPixelTest)
    321321{
    322     hasPauseAnimationAPI = ('layoutTestController' in window) && ('pauseAnimationAtTimeOnElementWithId' in layoutTestController);
     322    hasPauseAnimationAPI = ('testRunner' in window) && ('pauseAnimationAtTimeOnElementWithId' in testRunner);
    323323    if (disablePauseAnimationAPI)
    324324        hasPauseAnimationAPI = false;
    325325
    326     if (window.layoutTestController) {
     326    if (window.testRunner) {
    327327        if (!doPixelTest)
    328             layoutTestController.dumpAsText();
    329         layoutTestController.waitUntilDone();
     328            testRunner.dumpAsText();
     329        testRunner.waitUntilDone();
    330330    }
    331331   

  • trunk/LayoutTests/animations/state-at-end-event.html

    r84873 r119985  
    3737    function testEnded()
    3838    {
    39       if (window.layoutTestController)
    40         layoutTestController.notifyDone();
     39      if (window.testRunner)
     40        testRunner.notifyDone();
    4141    }
    4242   
    4343    function startTest()
    4444    {
    45       if (window.layoutTestController)
    46         layoutTestController.waitUntilDone();
     45      if (window.testRunner)
     46        testRunner.waitUntilDone();
    4747
    4848      document.getElementById('tester').addEventListener('webkitAnimationEnd', testEnded, false);

  • trunk/LayoutTests/animations/suspend-resume-animation-events.html

    r116729 r119985  
    4343    function startTest()
    4444    {
    45         if (window.layoutTestController) {
    46             layoutTestController.dumpAsText();
    47             layoutTestController.waitUntilDone();
     45        if (window.testRunner) {
     46            testRunner.dumpAsText();
     47            testRunner.waitUntilDone();
    4848        }
    4949       
    … …  
    5252        setTimeout(function()
    5353        {
    54             if (window.layoutTestController)
    55                 layoutTestController.notifyDone();
     54            if (window.testRunner)
     55                testRunner.notifyDone();
    5656        }, 350);
    5757    }

  • trunk/LayoutTests/animations/suspend-transform-animation.html

    r116610 r119985  
    3434  </style>
    3535  <script type="text/javascript" charset="utf-8">
    36     if (window.layoutTestController)
    37         layoutTestController.waitUntilDone();
     36    if (window.testRunner)
     37        testRunner.waitUntilDone();
    3838   
    3939    function suspendAndWaitForCompletion()
    … …  
    4343
    4444        window.setTimeout(function() {
    45             if (window.layoutTestController)
    46                 layoutTestController.notifyDone();
     45            if (window.testRunner)
     46                testRunner.notifyDone();
    4747        }, 250);
    4848    }

  • trunk/LayoutTests/animations/transition-and-animation-3.html

    r84872 r119985  
    3939    <script type="text/javascript" charset="utf-8">
    4040
    41     if (window.layoutTestController)
    42         layoutTestController.waitUntilDone();
     41    if (window.testRunner)
     42        testRunner.waitUntilDone();
    4343
    4444      const expectedValues = [

  • trunk/LayoutTests/animations/unanimated-style.html

    r84872 r119985  
    3232    <script type="text/javascript" charset="utf-8">
    3333
    34     if (window.layoutTestController)
    35         layoutTestController.waitUntilDone();
     34    if (window.testRunner)
     35        testRunner.waitUntilDone();
    3636
    3737      const expectedValues = [
Note: See TracChangeset for help on using the changeset viewer.