<!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>[183953] 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/183953">183953</a></dd>
<dt>Author</dt> <dd>roger_fong@apple.com</dd>
<dt>Date</dt> <dd>2015-05-07 15:25:36 -0700 (Thu, 07 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media Controls: Scrubber should be independent of actual video time, causes scrubber to be jumpy.
https://bugs.webkit.org/show_bug.cgi?id=144700.
<rdar://problem/19997548>
Reviewed by Jer Noble.
Update time and timeline during the timeline input event instead of the wrapper's mousemove.
(Controller.prototype.handleWrapperMouseMove):
(Controller.prototype.handleTimelineMouseMove):
(Controller.prototype.drawTimelineBackground):
(Controller.prototype.updateControlsWhileScrubbing):
Updates time and scrubber to reflect timeline user input.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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 (183952 => 183953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-07 22:23:05 UTC (rev 183952)
+++ trunk/Source/WebCore/ChangeLog 2015-05-07 22:25:36 UTC (rev 183953)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-05-06 Roger Fong <roger_fong@apple.com>
+
+ Media Controls: Scrubber should be independent of actual video time, causes scrubber to be jumpy.
+ https://bugs.webkit.org/show_bug.cgi?id=144700.
+ <rdar://problem/19997548>
+
+ Reviewed by Jer Noble.
+
+ Update time and timeline during the timeline input event instead of the wrapper's mousemove.
+ (Controller.prototype.handleWrapperMouseMove):
+ (Controller.prototype.handleTimelineMouseMove):
+ (Controller.prototype.drawTimelineBackground):
+
+ (Controller.prototype.updateControlsWhileScrubbing):
+ Updates time and scrubber to reflect timeline user input.
+
</ins><span class="cx"> 2015-05-07 Yoav Weiss <yoav@yoav.ws>
</span><span class="cx">
</span><span class="cx"> Handle meta viewport in HTMLPreloadScanner
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (183952 => 183953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-05-07 22:23:05 UTC (rev 183952)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-05-07 22:25:36 UTC (rev 183953)
</span><span class="lines">@@ -762,9 +762,6 @@
</span><span class="cx"> if (this.controlsAreHidden())
</span><span class="cx"> this.showControls();
</span><span class="cx"> this.resetHideControlsTimer();
</span><del>-
- if (this.scrubbing)
- this.updateTime();
</del><span class="cx">
</span><span class="cx"> if (!this.isDragging)
</span><span class="cx"> return;
</span><span class="lines">@@ -855,6 +852,7 @@
</span><span class="cx"> handleTimelineInput: function(event)
</span><span class="cx"> {
</span><span class="cx"> this.video.fastSeek(this.controls.timeline.value);
</span><ins>+ this.updateControlsWhileScrubbing();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleTimelineChange: function(event)
</span><span class="lines">@@ -1157,8 +1155,8 @@
</span><span class="cx">
</span><span class="cx"> if (!width || !height)
</span><span class="cx"> return;
</span><del>-
- var played = this.video.currentTime / this.video.duration;
</del><ins>+
+ var played = this.controls.timeline.value / this.controls.timeline.max;
</ins><span class="cx"> var buffered = 0;
</span><span class="cx"> for (var i = 0, end = this.video.buffered.length; i < end; ++i)
</span><span class="cx"> buffered = Math.max(this.video.buffered.end(i), buffered);
</span><span class="lines">@@ -1408,7 +1406,19 @@
</span><span class="cx"> this.controls.timeline.value = this.video.currentTime;
</span><span class="cx"> this.controls.remainingTime.innerText = this.formatTime(timeRemaining);
</span><span class="cx"> },
</span><ins>+
+ updateControlsWhileScrubbing: function()
+ {
+ if (!this.scrubbing)
+ return;
</ins><span class="cx">
</span><ins>+ var currentTime = (this.controls.timeline.value / this.controls.timeline.max) * this.video.duration;
+ var timeRemaining = currentTime - this.video.duration;
+ this.controls.currentTime.innerText = this.formatTime(currentTime);
+ this.controls.remainingTime.innerText = this.formatTime(timeRemaining);
+ this.drawTimelineBackground();
+ },
+
</ins><span class="cx"> updateReadyState: function()
</span><span class="cx"> {
</span><span class="cx"> this.updateStatusDisplay();
</span></span></pre>
</div>
</div>
</body>
</html>