Changeset 202514 in webkit


Ignore:
Timestamp:
Jun 27, 2016 2:45:49 PM (8 years ago)
Author:
Ryan Haddad
Message:

Unreviewed, rolling out r202505.
​https://bugs.webkit.org/show_bug.cgi?id=159169

The test added with this change is flaky and it caused an
existing test to time out on El Capitan. (Requested by
ryanhaddad on #webkit).

Reverted changeset:

"[iOS] Media controls are too cramped with small video"
​https://bugs.webkit.org/show_bug.cgi?id=158815
​http://trac.webkit.org/changeset/202505

Patch by Commit Queue <​commit-queue@webkit.org> on 2016-06-27

Location:
trunk
Files:
2 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r202511 r202514  
     12016-06-27  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r202505.
     4        https://bugs.webkit.org/show_bug.cgi?id=159169
     5
     6        The test added with this change is flaky and it caused an
     7        existing test to time out on El Capitan. (Requested by
     8        ryanhaddad on #webkit).
     9
     10        Reverted changeset:
     11
     12        "[iOS] Media controls are too cramped with small video"
     13        https://bugs.webkit.org/show_bug.cgi?id=158815
     14        http://trac.webkit.org/changeset/202505
     15
    1162016-06-27  Alex Christensen  <achristensen@webkit.org>
    217

  • trunk/LayoutTests/platform/mac-yosemite/http/tests/media/hls/video-controls-live-stream-expected.txt

    r202505 r202514  
    55-webkit-media-text-track-container: classes: [hidden]
    66-webkit-media-show-controls: classes: []
    7 -webkit-media-controls-current-time-display: classes: [clone six-digit-time]
    8 -webkit-media-controls-time-remaining-display: classes: [clone six-digit-time]
    97-webkit-media-controls-wireless-playback-status: classes: [hidden]
    108-webkit-media-controls-wireless-playback-text: classes: []

  • trunk/LayoutTests/platform/mac/http/tests/media/hls/video-controls-live-stream-expected.txt

    r202505 r202514  
    55-webkit-media-text-track-container: classes: [hidden]
    66-webkit-media-show-controls: classes: []
    7 -webkit-media-controls-current-time-display: classes: [clone six-digit-time]
    8 -webkit-media-controls-time-remaining-display: classes: [clone six-digit-time]
    97-webkit-media-controls-wireless-playback-status: classes: [hidden]
    108-webkit-media-controls-wireless-playback-text: classes: []

  • trunk/Source/WebCore/ChangeLog

    r202513 r202514  
     12016-06-27  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r202505.
     4        https://bugs.webkit.org/show_bug.cgi?id=159169
     5
     6        The test added with this change is flaky and it caused an
     7        existing test to time out on El Capitan. (Requested by
     8        ryanhaddad on #webkit).
     9
     10        Reverted changeset:
     11
     12        "[iOS] Media controls are too cramped with small video"
     13        https://bugs.webkit.org/show_bug.cgi?id=158815
     14        http://trac.webkit.org/changeset/202505
     15
    1162016-06-27  Benjamin Poulain  <bpoulain@apple.com>
    217

  • trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css

    r202505 r202514  
    11431143    margin-left: 0px;
    11441144}
    1145 
    1146 /* Time display clones that we use in updateLayoutForDisplayedWidth(). */
    1147 ::-webkit-media-controls-current-time-display.clone,
    1148 ::-webkit-media-controls-time-remaining-display.clone {
    1149     position: absolute;
    1150     display: inline;
    1151     top: 100%;
    1152     mix-blend-mode: normal;
    1153 }

  • trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js

    r202509 r202514  
    2626    this.createBase();
    2727    this.createControls();
    28     this.createTimeClones();
    2928    this.updateBase();
    3029    this.updateControls();
    … …  
    134133        down: 40
    135134    },
    136     MinimumTimelineWidth: 100,
     135    MinimumTimelineWidth: 150,
    137136    ButtonWidth: 32,
    138137
    … …  
    530529        if (!Controller.gSimulateWirelessPlaybackTarget)
    531530            wirelessTargetPicker.classList.add(this.ClassNames.hidden);
    532     },
    533 
    534     createTimeClones: function()
    535     {
    536         var currentTimeClone = this.currentTimeClone = document.createElement('div');
    537         currentTimeClone.setAttribute('pseudo', '-webkit-media-controls-current-time-display');
    538         currentTimeClone.setAttribute('aria-hidden', 'true');
    539         currentTimeClone.classList.add('clone');
    540         this.base.appendChild(currentTimeClone);
    541 
    542         var remainingTimeClone = this.remainingTimeClone = document.createElement('div');
    543         remainingTimeClone.setAttribute('pseudo', '-webkit-media-controls-time-remaining-display');
    544         remainingTimeClone.setAttribute('aria-hidden', 'true');
    545         remainingTimeClone.classList.add('clone');
    546         this.base.appendChild(remainingTimeClone);
    547531    },
    548532
    … …  
    12951279        this.setIsLive(duration === Number.POSITIVE_INFINITY);
    12961280
    1297         var timeControls = [this.controls.currentTime, this.controls.remainingTime, this.currentTimeClone, this.remainingTimeClone];
    1298 
    1299         function removeTimeClass(className) {
    1300             for (let element of timeControls)
    1301                 element.classList.remove(className);
    1302         }
    1303 
    1304         function addTimeClass(className) {
    1305             for (let element of timeControls)
    1306                 element.classList.add(className);
    1307         }
    1308 
    13091281        // Reset existing style.
    1310         removeTimeClass(this.ClassNames.threeDigitTime);
    1311         removeTimeClass(this.ClassNames.fourDigitTime);
    1312         removeTimeClass(this.ClassNames.fiveDigitTime);
    1313         removeTimeClass(this.ClassNames.sixDigitTime);
    1314 
    1315         if (duration >= 60*60*10)
    1316             addTimeClass(this.ClassNames.sixDigitTime);
    1317         else if (duration >= 60*60)
    1318             addTimeClass(this.ClassNames.fiveDigitTime);
    1319         else if (duration >= 60*10)
    1320             addTimeClass(this.ClassNames.fourDigitTime);
    1321         else
    1322             addTimeClass(this.ClassNames.threeDigitTime);
     1282        this.controls.currentTime.classList.remove(this.ClassNames.threeDigitTime);
     1283        this.controls.currentTime.classList.remove(this.ClassNames.fourDigitTime);
     1284        this.controls.currentTime.classList.remove(this.ClassNames.fiveDigitTime);
     1285        this.controls.currentTime.classList.remove(this.ClassNames.sixDigitTime);
     1286        this.controls.remainingTime.classList.remove(this.ClassNames.threeDigitTime);
     1287        this.controls.remainingTime.classList.remove(this.ClassNames.fourDigitTime);
     1288        this.controls.remainingTime.classList.remove(this.ClassNames.fiveDigitTime);
     1289        this.controls.remainingTime.classList.remove(this.ClassNames.sixDigitTime);
     1290
     1291        if (duration >= 60*60*10) {
     1292            this.controls.currentTime.classList.add(this.ClassNames.sixDigitTime);
     1293            this.controls.remainingTime.classList.add(this.ClassNames.sixDigitTime);
     1294        } else if (duration >= 60*60) {
     1295            this.controls.currentTime.classList.add(this.ClassNames.fiveDigitTime);
     1296            this.controls.remainingTime.classList.add(this.ClassNames.fiveDigitTime);
     1297        } else if (duration >= 60*10) {
     1298            this.controls.currentTime.classList.add(this.ClassNames.fourDigitTime);
     1299            this.controls.remainingTime.classList.add(this.ClassNames.fourDigitTime);
     1300        } else {
     1301            this.controls.currentTime.classList.add(this.ClassNames.threeDigitTime);
     1302            this.controls.remainingTime.classList.add(this.ClassNames.threeDigitTime);
     1303        }
    13231304    },
    13241305
    … …  
    16461627        var visibleButtonWidth = this.ButtonWidth * visibleButtons.length;
    16471628
    1648         var currentTimeWidth = this.currentTimeClone.getBoundingClientRect().width;
    1649         var remainingTimeWidth = this.remainingTimeClone.getBoundingClientRect().width;
    1650 
    16511629        // Check if there is enough room for the scrubber.
    1652         var shouldDropTimeline = (visibleWidth - visibleButtonWidth - currentTimeWidth - remainingTimeWidth) < this.MinimumTimelineWidth;
     1630        var shouldDropTimeline = (visibleWidth - visibleButtonWidth) < this.MinimumTimelineWidth;
    16531631        this.controls.timeline.classList.toggle(this.ClassNames.dropped, shouldDropTimeline);
    16541632        this.controls.currentTime.classList.toggle(this.ClassNames.dropped, shouldDropTimeline);
    … …  
    17041682        var currentTime = this.video.currentTime;
    17051683        var timeRemaining = currentTime - this.video.duration;
    1706         this.currentTimeClone.innerText = this.controls.currentTime.innerText = this.formatTime(currentTime);
     1684        this.controls.currentTime.innerText = this.formatTime(currentTime);
    17071685        this.controls.timeline.value = this.video.currentTime;
    1708         this.remainingTimeClone.innerText = this.controls.remainingTime.innerText = this.formatTime(timeRemaining);
     1686        this.controls.remainingTime.innerText = this.formatTime(timeRemaining);
    17091687    },
    17101688   
    … …  
    17161694        var currentTime = (this.controls.timeline.value / this.controls.timeline.max) * this.video.duration;
    17171695        var timeRemaining = currentTime - this.video.duration;
    1718         this.currentTimeClone.innerText = this.controls.currentTime.innerText = this.formatTime(currentTime);
    1719         this.remainingTimeClone.innerText = this.controls.remainingTime.innerText = this.formatTime(timeRemaining);
     1696        this.controls.currentTime.innerText = this.formatTime(currentTime);
     1697        this.controls.remainingTime.innerText = this.formatTime(timeRemaining);
    17201698        this.drawTimelineBackground();
    17211699    },

  • trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css

    r202505 r202514  
    724724}
    725725
    726 /* Time display clones that we use in updateLayoutForDisplayedWidth(). */
    727 ::-webkit-media-controls-current-time-display.clone,
    728 ::-webkit-media-controls-time-remaining-display.clone {
    729     position: absolute;
    730     display: inline;
    731     top: 100%;
    732     mix-blend-mode: normal;
    733 }

  • trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js

    r202505 r202514  
    2828ControllerIOS.prototype = {
    2929    /* Constants */
    30     MinimumTimelineWidth: 150,
     30    MinimumTimelineWidth: 200,
    3131    ButtonWidth: 42,
    3232
Note: See TracChangeset for help on using the changeset viewer.