<!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>[181015] trunk/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/181015">181015</a></dd>
<dt>Author</dt> <dd>roger_fong@apple.com</dd>
<dt>Date</dt> <dd>2015-03-04 13:12:50 -0800 (Wed, 04 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update elapsed/remaining time displays on media inline controls on OSX.
https://bugs.webkit.org/show_bug.cgi?id=142264.
<rdar://problem/19997487>
Reviewed by Dean Jackson.
Div surrounding times are set widths. A larger width is used for times that are
an hour or longer. Time elapsed is right justified. Time remaining is left justified.
Times are displayed in 11pt Helvetica Neue.
* Modules/mediacontrols/mediaControlsApple.css:
(audio::-webkit-media-controls-time-remaining-display):
(audio::-webkit-media-controls-current-time-display):
(audio::-webkit-media-controls-time-remaining-display.hour-long-time):
(audio::-webkit-media-controls-current-time-display.hour-long-time):
(audio::-webkit-media-controls-time-remaining-display.ten-hour-long-time):
(audio::-webkit-media-controls-current-time-display.ten-hour-long-time):
* Modules/mediacontrols/mediaControlsApple.js:
(Controller.prototype.updateDuration):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplecss">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181014 => 181015)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-04 21:02:33 UTC (rev 181014)
+++ trunk/Source/WebCore/ChangeLog 2015-03-04 21:12:50 UTC (rev 181015)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-03-04 Roger Fong <roger_fong@apple.com>
+
+ Update elapsed/remaining time displays on media inline controls on OSX.
+ https://bugs.webkit.org/show_bug.cgi?id=142264.
+ <rdar://problem/19997487>
+
+ Reviewed by Dean Jackson.
+
+ Div surrounding times are set widths. A larger width is used for times that are
+ an hour or longer. Time elapsed is right justified. Time remaining is left justified.
+ Times are displayed in 11pt Helvetica Neue.
+ * Modules/mediacontrols/mediaControlsApple.css:
+ (audio::-webkit-media-controls-time-remaining-display):
+ (audio::-webkit-media-controls-current-time-display):
+ (audio::-webkit-media-controls-time-remaining-display.hour-long-time):
+ (audio::-webkit-media-controls-current-time-display.hour-long-time):
+ (audio::-webkit-media-controls-time-remaining-display.ten-hour-long-time):
+ (audio::-webkit-media-controls-current-time-display.ten-hour-long-time):
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.updateDuration):
+
</ins><span class="cx"> 2015-03-04 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement -apple-trailing-word: -apple-partially-balanced
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplecss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css (181014 => 181015)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2015-03-04 21:02:33 UTC (rev 181014)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2015-03-04 21:12:50 UTC (rev 181015)
</span><span class="lines">@@ -389,15 +389,11 @@
</span><span class="cx"> -webkit-user-select: none;
</span><span class="cx"> -webkit-flex: 0 0 0;
</span><span class="cx"> display: -webkit-flex;
</span><del>- -webkit-justify-content: center;
- -webkit-align-items: center;
</del><span class="cx"> cursor: default;
</span><del>- font: -webkit-small-control;
- font-size: 9px;
</del><span class="cx"> overflow-y: hidden;
</span><span class="cx"> overflow-x: hidden;
</span><del>- width: 45px;
- min-width: 45px;
</del><ins>+ font-family: 'Helvetica Neue';
+ font-size: 11px;
</ins><span class="cx"> color: white;
</span><span class="cx"> text-shadow: black 0px 1px 1px;
</span><span class="cx"> letter-spacing: normal;
</span><span class="lines">@@ -412,14 +408,42 @@
</span><span class="cx"> audio::-webkit-media-controls-current-time-display {
</span><span class="cx"> margin-left: 16px;
</span><span class="cx"> margin-right: 8px;
</span><ins>+ width: 28px;
+ min-width: 28px;
+ -webkit-align-items: flex-end;
+ -webkit-justify-content: flex-end;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> video::-webkit-media-controls-time-remaining-display,
</span><span class="cx"> audio::-webkit-media-controls-time-remaining-display {
</span><span class="cx"> margin-left: 8px;
</span><span class="cx"> margin-right: 16px;
</span><ins>+ width: 32px;
+ min-width: 32px;
+ -webkit-align-items: flex-start;
+ -webkit-justify-content: flex-start;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+video::-webkit-media-controls-time-remaining-display.hour-long-time,
+audio::-webkit-media-controls-time-remaining-display.hour-long-time {
+ min-width: 41px;
+}
+
+video::-webkit-media-controls-current-time-display.hour-long-time,
+audio::-webkit-media-controls-current-time-display.hour-long-time {
+ min-width: 37px;
+}
+
+video::-webkit-media-controls-time-remaining-display.ten-hour-long-time,
+audio::-webkit-media-controls-time-remaining-display.ten-hour-long-time {
+ min-width: 48px;
+}
+
+video::-webkit-media-controls-current-time-display.ten-hour-long-time,
+audio::-webkit-media-controls-current-time-display.ten-hour-long-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="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (181014 => 181015)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-03-04 21:02:33 UTC (rev 181014)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-03-04 21:12:50 UTC (rev 181015)
</span><span class="lines">@@ -77,6 +77,7 @@
</span><span class="cx"> hidden: 'hidden',
</span><span class="cx"> hiding: 'hiding',
</span><span class="cx"> hourLongTime: 'hour-long-time',
</span><ins>+ tenHourLongTime: 'ten-hour-long-time',
</ins><span class="cx"> list: 'list',
</span><span class="cx"> muteBox: 'mute-box',
</span><span class="cx"> muted: 'muted',
</span><span class="lines">@@ -967,6 +968,8 @@
</span><span class="cx">
</span><span class="cx"> this.controls.currentTime.classList.toggle(this.ClassNames.hourLongTime, duration >= 60*60);
</span><span class="cx"> this.controls.remainingTime.classList.toggle(this.ClassNames.hourLongTime, duration >= 60*60);
</span><ins>+ this.controls.currentTime.classList.toggle(this.ClassNames.tenHourLongTime, duration >= 60*60*10);
+ this.controls.remainingTime.classList.toggle(this.ClassNames.tenHourLongTime, duration >= 60*60*10);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> progressFillStyle: function(context)
</span></span></pre>
</div>
</div>
</body>
</html>