<!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>[164127] 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/164127">164127</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2014-02-14 13:15:52 -0800 (Fri, 14 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MediaControls] Add support for a loading progress meter
https://bugs.webkit.org/show_bug.cgi?id=128651
Reviewed by Eric Carlson.
Draw the loaded ranges underneath the timeline slider. Use a -webkit-canvas()
CSS function to allow the track of the slider to reflect the current state of
the video's loadedTimeRanges property.
Since -webkit-canvas() will share a backing store with all other CSS images using
the same identifier, use a monotonically increasing identifier to uniquely identify the timeline on a per-document basis.
* Modules/mediacontrols/mediaControlsApple.css:
(audio::-webkit-media-controls-timeline):
* Modules/mediacontrols/mediaControlsApple.js:
(Controller): Call updateProgress().
(Controller.prototype.createControls): Set up the canvas style and identifier.
(Controller.prototype.handleLoadStart): Call updateProgress().
(Controller.prototype.handleStalled): Ditto.
(Controller.prototype.handleReadyStateChange): Ditto.
(Controller.prototype.handleDurationChange): Ditto.
(Controller.prototype.handleProgress): Ditto.
(Controller.prototype.progressFillStyle): Added an easily overridable method
to determine the fill color of the progress bar.
(Controller.prototype.updateProgress): Draw the loadedTimeRanges into the timeline slider.
* Modules/mediacontrols/mediaControlsiOS.js:
(ControllerIOS.prototype.progressFillStyle): Override.</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>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164126 => 164127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-14 21:13:59 UTC (rev 164126)
+++ trunk/Source/WebCore/ChangeLog 2014-02-14 21:15:52 UTC (rev 164127)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-02-13 Jer Noble <jer.noble@apple.com>
+
+ [MediaControls] Add support for a loading progress meter
+ https://bugs.webkit.org/show_bug.cgi?id=128651
+
+ Reviewed by Eric Carlson.
+
+ Draw the loaded ranges underneath the timeline slider. Use a -webkit-canvas()
+ CSS function to allow the track of the slider to reflect the current state of
+ the video's loadedTimeRanges property.
+
+ Since -webkit-canvas() will share a backing store with all other CSS images using
+ the same identifier, use a monotonically increasing identifier to uniquely identify the timeline on a per-document basis.
+
+ * Modules/mediacontrols/mediaControlsApple.css:
+ (audio::-webkit-media-controls-timeline):
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller): Call updateProgress().
+ (Controller.prototype.createControls): Set up the canvas style and identifier.
+ (Controller.prototype.handleLoadStart): Call updateProgress().
+ (Controller.prototype.handleStalled): Ditto.
+ (Controller.prototype.handleReadyStateChange): Ditto.
+ (Controller.prototype.handleDurationChange): Ditto.
+ (Controller.prototype.handleProgress): Ditto.
+ (Controller.prototype.progressFillStyle): Added an easily overridable method
+ to determine the fill color of the progress bar.
+ (Controller.prototype.updateProgress): Draw the loadedTimeRanges into the timeline slider.
+ * Modules/mediacontrols/mediaControlsiOS.js:
+ (ControllerIOS.prototype.progressFillStyle): Override.
+
</ins><span class="cx"> 2014-02-14 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> Clean up JSDOMStringMap::deleteProperty
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplecss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css (164126 => 164127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2014-02-14 21:13:59 UTC (rev 164126)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2014-02-14 21:15:52 UTC (rev 164127)
</span><span class="lines">@@ -412,14 +412,7 @@
</span><span class="cx"> margin: 0;
</span><span class="cx">
</span><span class="cx"> border-radius: 4.5px;
</span><del>- background-color: black;
- background-image: -webkit-gradient(
- linear,
- left top,
- left bottom,
- color-stop(0, rgba(7, 7, 7, 0.3)),
- color-stop(1, rgba(37, 37, 37, 0.629))
- );
</del><ins>+ background-color: rgb(74, 74, 74);
</ins><span class="cx"> box-shadow: inset -1px 0 0 rgba(0, 0, 0, .68), 0 1px rgba(255, 255, 255, .08);
</span><span class="cx"> }
</span><span class="cx"> video::-webkit-media-controls-timeline::-webkit-slider-thumb,
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (164126 => 164127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-02-14 21:13:59 UTC (rev 164126)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-02-14 21:15:52 UTC (rev 164127)
</span><span class="lines">@@ -17,6 +17,7 @@
</span><span class="cx"> this.updateBase();
</span><span class="cx"> this.updateControls();
</span><span class="cx"> this.updateDuration();
</span><ins>+ this.updateProgress();
</ins><span class="cx"> this.updateTime();
</span><span class="cx"> this.updateReadyState();
</span><span class="cx"> this.updatePlaying();
</span><span class="lines">@@ -35,6 +36,9 @@
</span><span class="cx"> Controller.PlayAfterSeeking = 0;
</span><span class="cx"> Controller.PauseAfterSeeking = 1;
</span><span class="cx">
</span><ins>+/* Globals */
+Controller.gLastTimelineId = 0;
+
</ins><span class="cx"> Controller.prototype = {
</span><span class="cx">
</span><span class="cx"> /* Constants */
</span><span class="lines">@@ -54,6 +58,7 @@
</span><span class="cx"> durationchange: 'handleDurationChange',
</span><span class="cx"> play: 'handlePlay',
</span><span class="cx"> pause: 'handlePause',
</span><ins>+ progress: 'handleProgress',
</ins><span class="cx"> volumechange: 'handleVolumeChange',
</span><span class="cx"> webkitfullscreenchange: 'handleFullscreenChange',
</span><span class="cx"> },
</span><span class="lines">@@ -307,8 +312,10 @@
</span><span class="cx"> currentTime.setAttribute('role', 'timer');
</span><span class="cx">
</span><span class="cx"> var timeline = this.controls.timeline = document.createElement('input');
</span><ins>+ this.timelineID = ++Controller.gLastTimelineId;
</ins><span class="cx"> timeline.setAttribute('pseudo', '-webkit-media-controls-timeline');
</span><span class="cx"> timeline.setAttribute('aria-label', this.UIString('Duration'));
</span><ins>+ timeline.style.backgroundImage = '-webkit-canvas(timeline-' + this.timelineID + ')';
</ins><span class="cx"> timeline.type = 'range';
</span><span class="cx"> this.listenFor(timeline, 'change', this.handleTimelineChange);
</span><span class="cx"> this.listenFor(timeline, 'mouseover', this.handleTimelineMouseOver);
</span><span class="lines">@@ -458,6 +465,7 @@
</span><span class="cx"> handleLoadStart: function(event)
</span><span class="cx"> {
</span><span class="cx"> this.controls.statusDisplay.innerText = this.UIString('Loading');
</span><ins>+ this.updateProgress();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleError: function(event)
</span><span class="lines">@@ -478,6 +486,7 @@
</span><span class="cx"> handleStalled: function(event)
</span><span class="cx"> {
</span><span class="cx"> this.controls.statusDisplay.innerText = this.UIString('Stalled');
</span><ins>+ this.updateProgress();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleWaiting: function(event)
</span><span class="lines">@@ -490,6 +499,7 @@
</span><span class="cx"> this.updateReadyState();
</span><span class="cx"> this.updateCaptionButton();
</span><span class="cx"> this.updateCaptionContainer();
</span><ins>+ this.updateProgress();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleTimeUpdate: function(event)
</span><span class="lines">@@ -502,6 +512,7 @@
</span><span class="cx"> {
</span><span class="cx"> this.updateDuration();
</span><span class="cx"> this.updateTime();
</span><ins>+ this.updateProgress();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handlePlay: function(event)
</span><span class="lines">@@ -514,6 +525,11 @@
</span><span class="cx"> this.updatePlaying();
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ handleProgress: function(event)
+ {
+ this.updateProgress();
+ },
+
</ins><span class="cx"> handleVolumeChange: function(event)
</span><span class="cx"> {
</span><span class="cx"> this.updateVolume();
</span><span class="lines">@@ -840,6 +856,36 @@
</span><span class="cx"> this.controls.timeline.max = this.video.duration;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ progressFillStyle: function(context)
+ {
+ var height = this.controls.timeline.offsetHeight;
+ var gradient = context.createLinearGradient(0, 0, 0, height);
+ gradient.addColorStop(0, 'rgb(2, 2, 2)');
+ gradient.addColorStop(1, 'rgb(23, 23, 23)');
+ return gradient;
+ },
+
+ updateProgress: function()
+ {
+ var width = this.controls.timeline.offsetWidth;
+ var height = this.controls.timeline.offsetHeight;
+ var context = document.getCSSCanvasContext('2d', 'timeline-' + this.timelineID, width, height);
+ context.clearRect(0, 0, width, height);
+
+ context.fillStyle = this.progressFillStyle(context);
+
+ var duration = this.video.duration;
+ var buffered = this.video.buffered;
+ for (var i = 0, end = buffered.length; i < end; ++i) {
+ var startTime = buffered.start(i);
+ var endTime = buffered.end(i);
+
+ var startX = width * startTime / duration;
+ var endX = width * endTime / duration;
+ context.fillRect(startX, 0, endX - startX, height);
+ }
+ },
+
</ins><span class="cx"> formatTime: function(time)
</span><span class="cx"> {
</span><span class="cx"> if (isNaN(time))
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (164126 => 164127)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-02-14 21:13:59 UTC (rev 164126)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-02-14 21:15:52 UTC (rev 164127)
</span><span class="lines">@@ -137,6 +137,10 @@
</span><span class="cx">
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ progressFillStyle: function() {
+ return 'rgb(0, 0, 0)';
+ },
+
</ins><span class="cx"> handlePlayButtonTouchStart: function() {
</span><span class="cx"> this.controls.playButton.classList.add('active');
</span><span class="cx"> },
</span></span></pre>
</div>
</div>
</body>
</html>