Changeset 87583 in webkit


Ignore:
Timestamp:
May 27, 2011 4:18:07 PM (13 years ago)
Author:
sjl@chromium.org
Message:

2011-05-27 Steve Lacey <sjl@chromium.org>

Reviewed by Eric Carlson.

The behaviour of controls-after-reload was causing
layoutTestController in DumpRenderTree to misbehave causing a reported
failure in the test run after it (controls-css-overload).

Effectively, notifyDone() ended up getting called again after the test
was being torn down.

This change removes the unneeded seek at the end of the test (as we
should have already seeked to 0.

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

  • media/controls-after-reload.html:
  • platform/chromium/test_expectations.txt:
Location:
trunk/LayoutTests
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r87579 r87583  
     12011-05-27  Steve Lacey  <sjl@chromium.org>
     2
     3        Reviewed by Eric Carlson.
     4
     5        The behaviour of controls-after-reload was causing
     6        layoutTestController in DumpRenderTree to misbehave causing a reported
     7        failure in the test run after it (controls-css-overload).
     8
     9        Effectively, notifyDone() ended up getting called again after the test
     10        was being torn down.
     11
     12        This change removes the unneeded seek at the end of the test (as we
     13        should have already seeked to 0.
     14
     15        https://bugs.webkit.org/show_bug.cgi?id=60132
     16
     17        * media/controls-after-reload.html:
     18        * platform/chromium/test_expectations.txt:
     19
    1202011-05-27  Adam Klein  <adamk@chromium.org>
    221
  • trunk/LayoutTests/media/controls-after-reload.html

    r84409 r87583  
    44    <script>
    55    var video;
    6     var loadedCount = 0;
    76
    87    if (window.layoutTestController)
     
    1110    function finish()
    1211    {
    13         video.pause();
    14         video.currentTime = 0;
     12        video.removeEventListener("seeked", finish);
     13
    1514        if (window.layoutTestController)
    1615            layoutTestController.notifyDone();
     
    1918    function playing()
    2019    {
     20        video.removeEventListener("playing", playing);
     21
    2122        // Ensure that the frame is always the same in pixel result.
    2223        video.addEventListener("seeked", finish);
     
    2728    function canplaythrough()
    2829    {
    29         if (!loadedCount) {
    30             video.src = findMediaFile("video", "content/test");
    31             video.load();
    32             video.play();
    33             video.addEventListener("playing", playing);
    34         }
    35         loadedCount++;
     30        video.removeEventListener("canplaythrough", canplaythrough);
     31
     32        video.src = findMediaFile("video", "content/test");
     33        video.addEventListener("playing", playing);
     34        video.play();
    3635    }
    3736
     
    4241       
    4342        video.src = findMediaFile("video", "content/counting");
    44         video.load();
    4543    }
    4644    </script>
  • trunk/LayoutTests/platform/chromium/test_expectations.txt

    r87579 r87583  
    36333633// webkit roll : 84350:84431
    36343634BUGDPRANKE MAC LINUX : transitions/interrupt-zero-duration.html = TEXT PASS
    3635 BUGWK60132 BUGCR80771 : media/controls-css-overload.html = TIMEOUT PASS
    36363635BUGDPRANKE WIN LINUX : animations/change-one-anim.html = TEXT PASS
    36373636
Note: See TracChangeset for help on using the changeset viewer.