<!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>[178905] branches/safari-600.5-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/178905">178905</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-01-22 02:08:47 -0800 (Thu, 22 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/173790">r173790</a>. rdar://problem/19451354</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6005branchSourceWebCoreChangeLog">branches/safari-600.5-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModulesmediacontrolsmediaControlsApplecss">branches/safari-600.5-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModulesmediacontrolsmediaControlsApplejs">branches/safari-600.5-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6005branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (178904 => 178905)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-01-22 09:32:03 UTC (rev 178904)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-01-22 10:08:47 UTC (rev 178905)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2015-01-22 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r173790. rdar://problem/19451354
+
+ 2014-09-19 Jer Noble <jer.noble@apple.com>
+
+ [Media][Mac] Buffered range slides around as you resize a window
+ https://bugs.webkit.org/show_bug.cgi?id=136960
+
+ Reviewed by Dean Jackson.
+
+ Rather than using a canvas as the background image for the timeline slider, use a generated SVG image
+ to represent the buffered ranges.
+
+ * Modules/mediacontrols/mediaControlsApple.css:
+ (audio::-webkit-media-controls-timeline):
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.createControls):
+ (Controller.prototype.updateProgress):
+
+2015-01-22 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r173688. rdar://problem/19451277
</span><span class="cx">
</span><span class="cx"> 2014-09-16 Yusuke Suzuki <utatane.tea@gmail.com>
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreModulesmediacontrolsmediaControlsApplecss"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css (178904 => 178905)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2015-01-22 09:32:03 UTC (rev 178904)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2015-01-22 10:08:47 UTC (rev 178905)
</span><span class="lines">@@ -416,6 +416,7 @@
</span><span class="cx"> -webkit-flex: 1 1 0;
</span><span class="cx"> height: 9px;
</span><span class="cx"> margin: 0;
</span><ins>+ background-size: 100% 9px;
</ins><span class="cx">
</span><span class="cx"> border-radius: 4.5px;
</span><span class="cx"> background-color: rgb(74, 74, 74);
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (178904 => 178905)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-01-22 09:32:03 UTC (rev 178904)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-01-22 10:08:47 UTC (rev 178905)
</span><span class="lines">@@ -39,9 +39,6 @@
</span><span class="cx"> Controller.PlayAfterSeeking = 0;
</span><span class="cx"> Controller.PauseAfterSeeking = 1;
</span><span class="cx">
</span><del>-/* Globals */
-Controller.gLastTimelineId = 0;
-
</del><span class="cx"> Controller.prototype = {
</span><span class="cx">
</span><span class="cx"> /* Constants */
</span><span class="lines">@@ -330,10 +327,8 @@
</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><del>- this.timelineID = ++Controller.gLastTimelineId;
</del><span class="cx"> timeline.setAttribute('pseudo', '-webkit-media-controls-timeline');
</span><span class="cx"> timeline.setAttribute('aria-label', this.UIString('Duration'));
</span><del>- timeline.style.backgroundImage = '-webkit-canvas(timeline-' + this.timelineID + ')';
</del><span class="cx"> timeline.type = 'range';
</span><span class="cx"> this.listenFor(timeline, 'input', this.handleTimelineChange);
</span><span class="cx"> this.listenFor(timeline, 'mouseover', this.handleTimelineMouseOver);
</span><span class="lines">@@ -962,24 +957,21 @@
</span><span class="cx"> {
</span><span class="cx"> this.updateTimelineMetricsIfNeeded();
</span><span class="cx">
</span><del>- var width = this.timelineWidth;
- var height = this.timelineHeight;
</del><ins>+ var background = 'url(\'data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1 1" preserveAspectRatio="none"><linearGradient id="gradient" x2="0" y2="100%" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="rgb(2, 2, 2)"/><stop offset="1" stop-color="rgb(23, 23, 23)"/></linearGradient><g style="fill:url(#gradient)">'
</ins><span class="cx">
</span><del>- var context = document.getCSSCanvasContext('2d', 'timeline-' + this.timelineID, width, height);
- context.clearRect(0, 0, width, height);
-
- context.fillStyle = this.progressFillStyle(context);
-
</del><span class="cx"> var duration = this.video.duration;
</span><span class="cx"> var buffered = this.video.buffered;
</span><span class="cx"> for (var i = 0, end = buffered.length; i < end; ++i) {
</span><span class="cx"> var startTime = buffered.start(i);
</span><span class="cx"> var endTime = buffered.end(i);
</span><span class="cx">
</span><del>- var startX = width * startTime / duration;
- var endX = width * endTime / duration;
- context.fillRect(startX, 0, endX - startX, height);
</del><ins>+ var startX = startTime / duration;
+ var widthX = (endTime - startTime) / duration;
+ background += '<rect x="' + startX + '" y="0" width="' + widthX + '" height="1"/>';
</ins><span class="cx"> }
</span><ins>+
+ background += '</g></svg>\')'
+ this.controls.timeline.style.backgroundImage = background;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> formatTime: function(time)
</span></span></pre>
</div>
</div>
</body>
</html>