Skip to content
Permalink
Browse files
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

Canonical link: https://commits.webkit.org/177265@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@202514 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
webkit-commit-queue authored and ryanhaddad committed Jun 27, 2016
1 parent 52633f3 commit 7358447c94c61e98bcae9c92aea1ab361f949133
@@ -1,3 +1,18 @@
2016-06-27 Commit Queue <commit-queue@webkit.org>

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

2016-06-27 Alex Christensen <achristensen@webkit.org>

Send canAuthenticateAgainstProtectionSpace calls from NetworkProcess directly to UIProcess

This file was deleted.

This file was deleted.

@@ -4,8 +4,6 @@ EVENT(play)
EXPECTED (video.duration == 'Infinity') OK
-webkit-media-text-track-container: classes: [hidden]
-webkit-media-show-controls: classes: []
-webkit-media-controls-current-time-display: classes: [clone six-digit-time]
-webkit-media-controls-time-remaining-display: classes: [clone six-digit-time]
-webkit-media-controls-wireless-playback-status: classes: [hidden]
-webkit-media-controls-wireless-playback-text: classes: []
-webkit-media-controls-wireless-playback-text-top: classes: []
@@ -4,8 +4,6 @@ EVENT(play)
EXPECTED (video.duration == 'Infinity') OK
-webkit-media-text-track-container: classes: [hidden]
-webkit-media-show-controls: classes: []
-webkit-media-controls-current-time-display: classes: [clone six-digit-time]
-webkit-media-controls-time-remaining-display: classes: [clone six-digit-time]
-webkit-media-controls-wireless-playback-status: classes: [hidden]
-webkit-media-controls-wireless-playback-text: classes: []
-webkit-media-controls-wireless-playback-text-top: classes: []
@@ -1,3 +1,18 @@
2016-06-27 Commit Queue <commit-queue@webkit.org>

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

2016-06-27 Benjamin Poulain <bpoulain@apple.com>

Add :focus-within to the status page
@@ -1142,12 +1142,3 @@ video:-webkit-full-screen::-webkit-media-controls-panel .picture-in-picture-butt
margin-right: 24px;
margin-left: 0px;
}

/* Time display clones that we use in updateLayoutForDisplayedWidth(). */
::-webkit-media-controls-current-time-display.clone,
::-webkit-media-controls-time-remaining-display.clone {
position: absolute;
display: inline;
top: 100%;
mix-blend-mode: normal;
}
@@ -25,7 +25,6 @@ function Controller(root, video, host)
this.addVideoListeners();
this.createBase();
this.createControls();
this.createTimeClones();
this.updateBase();
this.updateControls();
this.updateDuration();
@@ -133,7 +132,7 @@ Controller.prototype = {
right: 39,
down: 40
},
MinimumTimelineWidth: 100,
MinimumTimelineWidth: 150,
ButtonWidth: 32,

extend: function(child)
@@ -531,21 +530,6 @@ Controller.prototype = {
wirelessTargetPicker.classList.add(this.ClassNames.hidden);
},

createTimeClones: function()
{
var currentTimeClone = this.currentTimeClone = document.createElement('div');
currentTimeClone.setAttribute('pseudo', '-webkit-media-controls-current-time-display');
currentTimeClone.setAttribute('aria-hidden', 'true');
currentTimeClone.classList.add('clone');
this.base.appendChild(currentTimeClone);

var remainingTimeClone = this.remainingTimeClone = document.createElement('div');
remainingTimeClone.setAttribute('pseudo', '-webkit-media-controls-time-remaining-display');
remainingTimeClone.setAttribute('aria-hidden', 'true');
remainingTimeClone.classList.add('clone');
this.base.appendChild(remainingTimeClone);
},

setControlsType: function(type)
{
if (type === this.controlsType)
@@ -1294,32 +1278,29 @@ Controller.prototype = {

this.setIsLive(duration === Number.POSITIVE_INFINITY);

var timeControls = [this.controls.currentTime, this.controls.remainingTime, this.currentTimeClone, this.remainingTimeClone];

function removeTimeClass(className) {
for (let element of timeControls)
element.classList.remove(className);
}

function addTimeClass(className) {
for (let element of timeControls)
element.classList.add(className);
}

// Reset existing style.
removeTimeClass(this.ClassNames.threeDigitTime);
removeTimeClass(this.ClassNames.fourDigitTime);
removeTimeClass(this.ClassNames.fiveDigitTime);
removeTimeClass(this.ClassNames.sixDigitTime);

if (duration >= 60*60*10)
addTimeClass(this.ClassNames.sixDigitTime);
else if (duration >= 60*60)
addTimeClass(this.ClassNames.fiveDigitTime);
else if (duration >= 60*10)
addTimeClass(this.ClassNames.fourDigitTime);
else
addTimeClass(this.ClassNames.threeDigitTime);
this.controls.currentTime.classList.remove(this.ClassNames.threeDigitTime);
this.controls.currentTime.classList.remove(this.ClassNames.fourDigitTime);
this.controls.currentTime.classList.remove(this.ClassNames.fiveDigitTime);
this.controls.currentTime.classList.remove(this.ClassNames.sixDigitTime);
this.controls.remainingTime.classList.remove(this.ClassNames.threeDigitTime);
this.controls.remainingTime.classList.remove(this.ClassNames.fourDigitTime);
this.controls.remainingTime.classList.remove(this.ClassNames.fiveDigitTime);
this.controls.remainingTime.classList.remove(this.ClassNames.sixDigitTime);

if (duration >= 60*60*10) {
this.controls.currentTime.classList.add(this.ClassNames.sixDigitTime);
this.controls.remainingTime.classList.add(this.ClassNames.sixDigitTime);
} else if (duration >= 60*60) {
this.controls.currentTime.classList.add(this.ClassNames.fiveDigitTime);
this.controls.remainingTime.classList.add(this.ClassNames.fiveDigitTime);
} else if (duration >= 60*10) {
this.controls.currentTime.classList.add(this.ClassNames.fourDigitTime);
this.controls.remainingTime.classList.add(this.ClassNames.fourDigitTime);
} else {
this.controls.currentTime.classList.add(this.ClassNames.threeDigitTime);
this.controls.remainingTime.classList.add(this.ClassNames.threeDigitTime);
}
},

progressFillStyle: function(context)
@@ -1645,11 +1626,8 @@ Controller.prototype = {
// This tells us how much room we need in order to display every visible button.
var visibleButtonWidth = this.ButtonWidth * visibleButtons.length;

var currentTimeWidth = this.currentTimeClone.getBoundingClientRect().width;
var remainingTimeWidth = this.remainingTimeClone.getBoundingClientRect().width;

// Check if there is enough room for the scrubber.
var shouldDropTimeline = (visibleWidth - visibleButtonWidth - currentTimeWidth - remainingTimeWidth) < this.MinimumTimelineWidth;
var shouldDropTimeline = (visibleWidth - visibleButtonWidth) < this.MinimumTimelineWidth;
this.controls.timeline.classList.toggle(this.ClassNames.dropped, shouldDropTimeline);
this.controls.currentTime.classList.toggle(this.ClassNames.dropped, shouldDropTimeline);
this.controls.thumbnailTrack.classList.toggle(this.ClassNames.dropped, shouldDropTimeline);
@@ -1703,9 +1681,9 @@ Controller.prototype = {
{
var currentTime = this.video.currentTime;
var timeRemaining = currentTime - this.video.duration;
this.currentTimeClone.innerText = this.controls.currentTime.innerText = this.formatTime(currentTime);
this.controls.currentTime.innerText = this.formatTime(currentTime);
this.controls.timeline.value = this.video.currentTime;
this.remainingTimeClone.innerText = this.controls.remainingTime.innerText = this.formatTime(timeRemaining);
this.controls.remainingTime.innerText = this.formatTime(timeRemaining);
},

updateControlsWhileScrubbing: function()
@@ -1715,8 +1693,8 @@ Controller.prototype = {

var currentTime = (this.controls.timeline.value / this.controls.timeline.max) * this.video.duration;
var timeRemaining = currentTime - this.video.duration;
this.currentTimeClone.innerText = this.controls.currentTime.innerText = this.formatTime(currentTime);
this.remainingTimeClone.innerText = this.controls.remainingTime.innerText = this.formatTime(timeRemaining);
this.controls.currentTime.innerText = this.formatTime(currentTime);
this.controls.remainingTime.innerText = this.formatTime(timeRemaining);
this.drawTimelineBackground();
},

@@ -723,11 +723,3 @@ video::-webkit-media-controls-panel-container.picture-in-picture {
pointer-events: none;
}

/* Time display clones that we use in updateLayoutForDisplayedWidth(). */
::-webkit-media-controls-current-time-display.clone,
::-webkit-media-controls-time-remaining-display.clone {
position: absolute;
display: inline;
top: 100%;
mix-blend-mode: normal;
}
@@ -27,7 +27,7 @@ ControllerIOS.StartPlaybackControls = 2;

ControllerIOS.prototype = {
/* Constants */
MinimumTimelineWidth: 150,
MinimumTimelineWidth: 200,
ButtonWidth: 42,

get idiom()

0 comments on commit 7358447

Please sign in to comment.