Title: [181015] trunk/Source/WebCore
- Revision
- 181015
- Author
- [email protected]
- Date
- 2015-03-04 13:12:50 -0800 (Wed, 04 Mar 2015)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (181014 => 181015)
--- 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)
@@ -1,3 +1,24 @@
+2015-03-04 Roger Fong <[email protected]>
+
+ 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):
+
2015-03-04 Myles C. Maxfield <[email protected]>
Implement -apple-trailing-word: -apple-partially-balanced
Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css (181014 => 181015)
--- 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)
@@ -389,15 +389,11 @@
-webkit-user-select: none;
-webkit-flex: 0 0 0;
display: -webkit-flex;
- -webkit-justify-content: center;
- -webkit-align-items: center;
cursor: default;
- font: -webkit-small-control;
- font-size: 9px;
overflow-y: hidden;
overflow-x: hidden;
- width: 45px;
- min-width: 45px;
+ font-family: 'Helvetica Neue';
+ font-size: 11px;
color: white;
text-shadow: black 0px 1px 1px;
letter-spacing: normal;
@@ -412,14 +408,42 @@
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;
}
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.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;
+}
+
video::-webkit-media-controls-timeline-container,
audio::-webkit-media-controls-timeline-container {
display: -webkit-flex;
Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (181014 => 181015)
--- 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)
@@ -77,6 +77,7 @@
hidden: 'hidden',
hiding: 'hiding',
hourLongTime: 'hour-long-time',
+ tenHourLongTime: 'ten-hour-long-time',
list: 'list',
muteBox: 'mute-box',
muted: 'muted',
@@ -967,6 +968,8 @@
this.controls.currentTime.classList.toggle(this.ClassNames.hourLongTime, duration >= 60*60);
this.controls.remainingTime.classList.toggle(this.ClassNames.hourLongTime, duration >= 60*60);
+ this.controls.currentTime.classList.toggle(this.ClassNames.tenHourLongTime, duration >= 60*60*10);
+ this.controls.remainingTime.classList.toggle(this.ClassNames.tenHourLongTime, duration >= 60*60*10);
},
progressFillStyle: function(context)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
