Changeset 211986 in webkit


Ignore:
Timestamp:
Feb 9, 2017 1:31:35 PM (7 years ago)
Author:
Ryan Haddad
Message:

Unreviewed, rolling out r211802.

This change caused fast/regions/inline-block-inside-anonymous-
overflow-with-covered-controls.html to be a flaky failure.

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/211802

Location:
trunk
Files:
2 deleted
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r211985 r211986  
     12017-02-09  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, rolling out r211802.
     4
     5        This change caused fast/regions/inline-block-inside-anonymous-
     6        overflow-with-covered-controls.html to be a flaky failure.
     7
     8        Reverted changeset:
     9
     10        "[Modern Media Controls] Improve handling of <video> with only
     11        audio tracks"
     12        https://bugs.webkit.org/show_bug.cgi?id=167836
     13        http://trac.webkit.org/changeset/211802
     14
    1152017-02-09  Ryan Haddad  <ryanhaddad@apple.com>
    216
  • trunk/LayoutTests/fast/regions/inline-block-inside-anonymous-overflow-with-covered-controls-expected.html

    r211802 r211986  
    1 <!DOCTYPE html><!-- webkit-test-runner [ enableModernMediaControls=false ] -->
     1<!DOCTYPE html>
    22<html>
    33    <head>
     
    4545        <div class="region" id="region1">
    4646            <div class="article" id="article1">
    47                 <video id="video" src="../../media/content/test.mp4" controls></video><span style="color:#00FF00">
     47                <video id="video" controls></video><span style="color:#00FF00">
    4848            </div>
    4949        </div>
  • trunk/LayoutTests/fast/regions/inline-block-inside-anonymous-overflow-with-covered-controls.html

    r211802 r211986  
    1 <!DOCTYPE html><!-- webkit-test-runner [ enableModernMediaControls=false ] -->
     1<!DOCTYPE html>
    22<html>
    33    <head>
     
    4545        <div class="region" id="region2"></div>
    4646        <div id="article">
    47             <video id="video" src="../../media/content/test.mp4" controls></video><span style="color:#00FF00">This text, together with the video element, are inside an anonymouse block</span>
     47            <video id="video" controls></video><span style="color:#00FF00">This text, together with the video element, are inside an anonymouse block</span>
    4848            <div id="after" style="color:blue">This div is after the anonymous block</div>
    4949        </div>
  • trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-expected.txt

    r211802 r211986  
    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

    r211802 r211986  
    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

    r211802 r211986  
    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

    r211802 r211986  
    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

    r211802 r211986  
    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

    r211981 r211986  
     12017-02-09  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, rolling out r211802.
     4
     5        This change caused fast/regions/inline-block-inside-anonymous-
     6        overflow-with-covered-controls.html to be a flaky failure.
     7
     8        Reverted changeset:
     9
     10        "[Modern Media Controls] Improve handling of <video> with only
     11        audio tracks"
     12        https://bugs.webkit.org/show_bug.cgi?id=167836
     13        http://trac.webkit.org/changeset/211802
     14
    1152017-02-09  Alex Christensen  <achristensen@webkit.org>
    216
  • trunk/Source/WebCore/Modules/modern-media-controls/media/controls-visibility-support.js

    r211802 r211986  
    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

    r211802 r211986  
    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.