<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[181102] branches/safari-600.1.4.15-branch/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/181102">181102</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-03-05 14:28:41 -0800 (Thu, 05 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/181085">r181085</a>. <rdar://problem/20058743>
2015-03-04 Dean Jackson <dino@apple.com>
[iOS Media] Small inline controls can clip the time widgets
https://bugs.webkit.org/show_bug.cgi?id=142319
Reviewed by Eric Carlson.
Start counting the number of digits in a duration so that
we can assign classes to the time widgets that specify
a minimum width.
* Modules/mediacontrols/mediaControlsApple.css: Replace the hour-long and ten-hour-long
classes with number of digits.
(audio::-webkit-media-controls-time-remaining-display.five-digit-time):
(audio::-webkit-media-controls-current-time-display.five-digit-time):
(audio::-webkit-media-controls-time-remaining-display.six-digit-time):
(audio::-webkit-media-controls-current-time-display.six-digit-time):
(audio::-webkit-media-controls-time-remaining-display.hour-long-time): Deleted.
(audio::-webkit-media-controls-current-time-display.hour-long-time): Deleted.
(audio::-webkit-media-controls-time-remaining-display.ten-hour-long-time): Deleted.
(audio::-webkit-media-controls-current-time-display.ten-hour-long-time): Deleted.
* Modules/mediacontrols/mediaControlsApple.js: Add some new class names.
(Controller.prototype.updateDuration): Set the class of the time
widgets when we know how long the media runs.
* Modules/mediacontrols/mediaControlsiOS.css: Values for iOS that
are big enough to avoid clipping.
(video::-webkit-media-controls-current-time-display):
(video::-webkit-media-controls-time-remaining-display):
(video::-webkit-media-controls-current-time-display.three-digit-time):
(video::-webkit-media-controls-time-remaining-display.three-digit-time):
(video::-webkit-media-controls-current-time-display.four-digit-time):
(video::-webkit-media-controls-time-remaining-display.four-digit-time):
(video::-webkit-media-controls-current-time-display.five-digit-time):
(video::-webkit-media-controls-time-remaining-display.five-digit-time):
(video::-webkit-media-controls-current-time-display.six-digit-time):
(video::-webkit-media-controls-time-remaining-display.six-digit-time):
(audio::-webkit-media-controls-timeline-container): Deleted.
(video::-webkit-media-text-track-container): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchSourceWebCoreChangeLog">branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreModulesmediacontrolsmediaControlsApplecss">branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreModulesmediacontrolsmediaControlsApplejs">branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreModulesmediacontrolsmediaControlsiOScss">branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreModulesmediacontrolsmediaControlsiOSjs">branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (181101 => 181102)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-03-05 22:25:53 UTC (rev 181101)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-03-05 22:28:41 UTC (rev 181102)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2015-03-05 Dean Jackson <dino@apple.com>
+
+ Merge r181085. <rdar://problem/20058743>
+
+ 2015-03-04 Dean Jackson <dino@apple.com>
+
+ [iOS Media] Small inline controls can clip the time widgets
+ https://bugs.webkit.org/show_bug.cgi?id=142319
+
+ Reviewed by Eric Carlson.
+
+ Start counting the number of digits in a duration so that
+ we can assign classes to the time widgets that specify
+ a minimum width.
+
+ * Modules/mediacontrols/mediaControlsApple.css: Replace the hour-long and ten-hour-long
+ classes with number of digits.
+ (audio::-webkit-media-controls-time-remaining-display.five-digit-time):
+ (audio::-webkit-media-controls-current-time-display.five-digit-time):
+ (audio::-webkit-media-controls-time-remaining-display.six-digit-time):
+ (audio::-webkit-media-controls-current-time-display.six-digit-time):
+ (audio::-webkit-media-controls-time-remaining-display.hour-long-time): Deleted.
+ (audio::-webkit-media-controls-current-time-display.hour-long-time): Deleted.
+ (audio::-webkit-media-controls-time-remaining-display.ten-hour-long-time): Deleted.
+ (audio::-webkit-media-controls-current-time-display.ten-hour-long-time): Deleted.
+
+ * Modules/mediacontrols/mediaControlsApple.js: Add some new class names.
+ (Controller.prototype.updateDuration): Set the class of the time
+ widgets when we know how long the media runs.
+
+ * Modules/mediacontrols/mediaControlsiOS.css: Values for iOS that
+ are big enough to avoid clipping.
+ (video::-webkit-media-controls-current-time-display):
+ (video::-webkit-media-controls-time-remaining-display):
+ (video::-webkit-media-controls-current-time-display.three-digit-time):
+ (video::-webkit-media-controls-time-remaining-display.three-digit-time):
+ (video::-webkit-media-controls-current-time-display.four-digit-time):
+ (video::-webkit-media-controls-time-remaining-display.four-digit-time):
+ (video::-webkit-media-controls-current-time-display.five-digit-time):
+ (video::-webkit-media-controls-time-remaining-display.five-digit-time):
+ (video::-webkit-media-controls-current-time-display.six-digit-time):
+ (video::-webkit-media-controls-time-remaining-display.six-digit-time):
+ (audio::-webkit-media-controls-timeline-container): Deleted.
+ (video::-webkit-media-text-track-container): Deleted.
+
</ins><span class="cx"> 2015-03-04 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r180910. rdar://problem/19395137
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreModulesmediacontrolsmediaControlsApplecss"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css (181101 => 181102)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2015-03-05 22:25:53 UTC (rev 181101)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2015-03-05 22:28:41 UTC (rev 181102)
</span><span class="lines">@@ -484,11 +484,46 @@
</span><span class="cx"> text-decoration: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-video::-webkit-media-controls-timeline-container .hour-long-time,
-audio::-webkit-media-controls-timeline-container .hour-long-time {
- min-width: 67px;
</del><ins>+video::-webkit-media-controls-current-time-display,
+audio::-webkit-media-controls-current-time-display {
+ margin-left: 16px;
+ margin-right: 8px;
+ width: 28px;
+ min-width: 28px;
+ -webkit-align-items: flex-end;
+ -webkit-justify-content: flex-end;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+video::-webkit-media-controls-time-remaining-display,
+audio::-webkit-media-controls-time-remaining-display {
+ margin-left: 8px;
+ margin-right: 16px;
+ width: 32px;
+ min-width: 32px;
+ -webkit-align-items: flex-start;
+ -webkit-justify-content: flex-start;
+}
+
+video::-webkit-media-controls-time-remaining-display.five-digit-time,
+audio::-webkit-media-controls-time-remaining-display.five-digit-time {
+ min-width: 41px;
+}
+
+video::-webkit-media-controls-current-time-display.five-digit-time,
+audio::-webkit-media-controls-current-time-display.five-digit-time {
+ min-width: 37px;
+}
+
+video::-webkit-media-controls-time-remaining-display.six-digit-time,
+audio::-webkit-media-controls-time-remaining-display.six-digit-time {
+ min-width: 48px;
+}
+
+video::-webkit-media-controls-current-time-display.six-digit-time,
+audio::-webkit-media-controls-current-time-display.six-digit-time {
+ min-width: 44px;
+}
+
</ins><span class="cx"> video::-webkit-media-controls-timeline-container,
</span><span class="cx"> audio::-webkit-media-controls-timeline-container {
</span><span class="cx"> display: -webkit-flex;
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (181101 => 181102)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-03-05 22:25:53 UTC (rev 181101)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-03-05 22:28:41 UTC (rev 181102)
</span><span class="lines">@@ -74,7 +74,10 @@
</span><span class="cx"> failed: 'failed',
</span><span class="cx"> hidden: 'hidden',
</span><span class="cx"> hiding: 'hiding',
</span><del>- hourLongTime: 'hour-long-time',
</del><ins>+ threeDigitTime: 'three-digit-time',
+ fourDigitTime: 'four-digit-time',
+ fiveDigitTime: 'five-digit-time',
+ sixDigitTime: 'six-digit-time',
</ins><span class="cx"> list: 'list',
</span><span class="cx"> muteBox: 'mute-box',
</span><span class="cx"> muted: 'muted',
</span><span class="lines">@@ -937,8 +940,29 @@
</span><span class="cx">
</span><span class="cx"> this.setIsLive(duration === Number.POSITIVE_INFINITY);
</span><span class="cx">
</span><del>- this.controls.currentTime.classList.toggle(this.ClassNames.hourLongTime, duration >= 60*60);
- this.controls.remainingTime.classList.toggle(this.ClassNames.hourLongTime, duration >= 60*60);
</del><ins>+ // Reset existing style.
+ 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);
+ }
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> progressFillStyle: function(context)
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreModulesmediacontrolsmediaControlsiOScss"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css (181101 => 181102)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2015-03-05 22:25:53 UTC (rev 181101)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2015-03-05 22:28:41 UTC (rev 181102)
</span><span class="lines">@@ -375,14 +375,14 @@
</span><span class="cx"> audio::-webkit-media-controls-current-time-display,
</span><span class="cx"> video::-webkit-media-controls-current-time-display {
</span><span class="cx"> min-width: 32px;
</span><del>- -webkit-justify-content: left;
</del><ins>+ -webkit-justify-content: right;
</ins><span class="cx"> padding-right: 6px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> audio::-webkit-media-controls-time-remaining-display,
</span><span class="cx"> video::-webkit-media-controls-time-remaining-display {
</span><span class="cx"> min-width: 38px;
</span><del>- -webkit-justify-content: right;
</del><ins>+ -webkit-justify-content: left;
</ins><span class="cx"> padding-left: 6px;
</span><span class="cx"> margin-right: 6px;
</span><span class="cx"> }
</span><span class="lines">@@ -403,11 +403,46 @@
</span><span class="cx"> padding-right: 10px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-video::-webkit-media-controls-timeline-container .hour-long-time,
-audio::-webkit-media-controls-timeline-container .hour-long-time {
- min-width: 67px;
</del><ins>+audio::-webkit-media-controls-current-time-display.three-digit-time,
+video::-webkit-media-controls-current-time-display.three-digit-time {
+ min-width: 31px;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+audio::-webkit-media-controls-time-remaining-display.three-digit-time,
+video::-webkit-media-controls-time-remaining-display.three-digit-time {
+ min-width: 40px;
+}
+
+audio::-webkit-media-controls-current-time-display.four-digit-time,
+video::-webkit-media-controls-current-time-display.four-digit-time {
+ min-width: 40px;
+}
+
+audio::-webkit-media-controls-time-remaining-display.four-digit-time,
+video::-webkit-media-controls-time-remaining-display.four-digit-time {
+ min-width: 49px;
+}
+
+audio::-webkit-media-controls-current-time-display.five-digit-time,
+video::-webkit-media-controls-current-time-display.five-digit-time {
+ min-width: 51px;
+}
+
+audio::-webkit-media-controls-time-remaining-display.five-digit-time,
+video::-webkit-media-controls-time-remaining-display.five-digit-time {
+ min-width: 60px;
+}
+
+audio::-webkit-media-controls-current-time-display.six-digit-time,
+video::-webkit-media-controls-current-time-display.six-digit-time {
+ min-width: 60px;
+}
+
+audio::-webkit-media-controls-time-remaining-display.six-digit-time,
+video::-webkit-media-controls-time-remaining-display.six-digit-time {
+ min-width: 69px;
+}
+
</ins><span class="cx"> /* ================== STATUS DISPLAY ====================== */
</span><span class="cx">
</span><span class="cx"> video::-webkit-media-controls-status-display,
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreModulesmediacontrolsmediaControlsiOSjs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (181101 => 181102)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-03-05 22:25:53 UTC (rev 181101)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-03-05 22:28:41 UTC (rev 181102)
</span><span class="lines">@@ -355,9 +355,9 @@
</span><span class="cx"> var sign = time < 0 ? '-' : String();
</span><span class="cx">
</span><span class="cx"> if (intHours > 0)
</span><del>- return sign + intHours + ':' + String('00' + intMinutes).slice(-2) + ":" + String('00' + intSeconds).slice(-2);
</del><ins>+ return sign + intHours + ':' + String('0' + intMinutes).slice(-2) + ":" + String('0' + intSeconds).slice(-2);
</ins><span class="cx">
</span><del>- return sign + String('00' + intMinutes).slice(-2) + ":" + String('00' + intSeconds).slice(-2);
</del><ins>+ return sign + String('0' + intMinutes).slice(intMinutes >= 10 ? -2 : -1) + ":" + String('0' + intSeconds).slice(-2);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleTimelineChange: function(event) {
</span></span></pre>
</div>
</div>
</body>
</html>