Changeset 211729 in webkit


Ignore:
Timestamp:
Feb 6, 2017 9:28:04 AM (7 years ago)
Author:
Ryan Haddad
Message:

Unreviewed, rolling out r211722.

This change introduced a LayoutTest failure on mac-wk2.

Reverted changeset:

"[Modern Media Controls] Improve handling of <video> with only
audio tracks"
​https://bugs.webkit.org/show_bug.cgi?id=167836
​http://trac.webkit.org/changeset/211722

Location:
trunk
Files:
2 deleted
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r211724 r211729  
     12017-02-06  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, rolling out r211722.
     4
     5        This change introduced a LayoutTest failure on mac-wk2.
     6
     7        Reverted changeset:
     8
     9        "[Modern Media Controls] Improve handling of <video> with only
     10        audio tracks"
     11        https://bugs.webkit.org/show_bug.cgi?id=167836
     12        http://trac.webkit.org/changeset/211722
     13
    1142017-02-06  Antoine Quint  <graouts@apple.com>
    215

  • trunk/LayoutTests/fast/regions/inline-block-inside-anonymous-overflow-with-covered-controls-expected.html

    r211722 r211729  
    3131                display: block;
    3232                width: 350px;
    33                 height: 50px;
    34                 top: 335px;
     33                height: 40px;
     34                top: 350px;
    3535                left: 5px;
    3636                z-index: 1000;

  • trunk/LayoutTests/fast/regions/inline-block-inside-anonymous-overflow-with-covered-controls.html

    r211722 r211729  
    3030                display: block;
    3131                width: 350px;
    32                 height: 50px;
    33                 top: 335px;
     32                height: 40px;
     33                top: 350px;
    3434                left: 5px;
    3535                z-index: 1000;

  • trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-expected.txt

    r211722 r211729  
    44
    55
     6Media has not begun loading yet
     7PASS mediaController.controls.controlsBar.visible is false
     8PASS mediaController.controls.startButton.visible is false
    69
    710Media has loaded metadata
    8 PASS media.videoTracks.length is 1
    911PASS mediaController.controls.controlsBar.visible is true
    1012PASS mediaController.controls.startButton.visible is true

  • trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on.html

    r211722 r211729  
    1414const mediaController = createControls(shadowRoot, media, null);
    1515
     16debug("Media has not begun loading yet");
     17shouldBeFalse("mediaController.controls.controlsBar.visible");
     18shouldBeFalse("mediaController.controls.startButton.visible");
     19
    1620media.addEventListener("loadedmetadata", function() {
    1721    debug("");
    1822    debug("Media has loaded metadata");
    19     shouldBe("media.videoTracks.length", "1");
    2023    shouldBeTrue("mediaController.controls.controlsBar.visible");
    2124    shouldBeTrue("mediaController.controls.startButton.visible");

  • trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle-expected.txt

    r211722 r211729  
    44
    55
     6Media has not begun loading yet
     7PASS mediaController.controls.controlsBar.visible is false
     8PASS mediaController.controls.startButton.visible is false
    69
    710Media has loaded metadata
    8 PASS media.videoTracks.length is 1
    911PASS mediaController.controls.controlsBar.visible is true
    1012PASS mediaController.controls.startButton.visible is true

  • trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle.html

    r211722 r211729  
    3636}).observe(media, { attributes: true, attributeFilter: ["controls"] });
    3737
     38debug("Media has not begun loading yet");
     39shouldBeFalse("mediaController.controls.controlsBar.visible");
     40shouldBeFalse("mediaController.controls.startButton.visible");
     41
    3842media.addEventListener("loadedmetadata", function() {
    3943    debug("");
    4044    debug("Media has loaded metadata");
    41     shouldBe("media.videoTracks.length", "1");
    4245    shouldBeTrue("mediaController.controls.controlsBar.visible");
    4346    shouldBeTrue("mediaController.controls.startButton.visible");

  • trunk/LayoutTests/media/modern-media-controls/time-label/time-label-white-space-nowrap.html

    r211722 r211729  
    1515    media.pause();
    1616
    17     window.requestAnimationFrame(() => {
    18         timeLabel = window.internals.shadowRoot(media).querySelector(".time-label");
    19         shouldBeEqualToString("timeLabel.ownerDocument.defaultView.getComputedStyle(timeLabel).whiteSpace", "nowrap");
     17    timeLabel = window.internals.shadowRoot(media).querySelector(".time-label");
     18    shouldBeEqualToString("timeLabel.ownerDocument.defaultView.getComputedStyle(timeLabel).whiteSpace", "nowrap");
    2019
    21         debug("");
    22         media.remove();
    23         finishJSTest();
    24     });
     20    debug("");
     21    media.remove();
     22    finishJSTest();
    2523});
    2624

  • trunk/Source/WebCore/ChangeLog

    r211728 r211729  
     12017-02-06  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, rolling out r211722.
     4
     5        This change introduced a LayoutTest failure on mac-wk2.
     6
     7        Reverted changeset:
     8
     9        "[Modern Media Controls] Improve handling of <video> with only
     10        audio tracks"
     11        https://bugs.webkit.org/show_bug.cgi?id=167836
     12        http://trac.webkit.org/changeset/211722
     13
    1142017-02-06  Eric Carlson  <eric.carlson@apple.com>
    215

  • trunk/Source/WebCore/Modules/modern-media-controls/media/controls-visibility-support.js

    r211722 r211729  
    4949    }
    5050
    51     get tracksToMonitor()
    52     {
    53         return [this.mediaController.media.videoTracks];
    54     }
    55 
    5651    handleEvent()
    5752    {
    … …  
    6459    {
    6560        const media = this.mediaController.media;
    66         const isVideo = media instanceof HTMLVideoElement && media.videoTracks.length > 0;
     61        const isVideo = media instanceof HTMLVideoElement;
    6762        let shouldShowControls = this.mediaController.media.controls;
    6863        if (isVideo)

  • trunk/Source/WebCore/Modules/modern-media-controls/media/fullscreen-support.js

    r211722 r211729  
    7070        const control = this.control;
    7171        const media = this.mediaController.media;
    72         control.enabled = media.webkitSupportsFullscreen && media.videoTracks.length > 0;
     72        control.enabled = media.webkitSupportsFullscreen;
    7373        control.isFullScreen = media.webkitDisplayingFullscreen;
    7474    }
Note: See TracChangeset for help on using the changeset viewer.