<!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>[164365] trunk</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/164365">164365</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-19 09:24:47 -0800 (Wed, 19 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Setting playback rate on Media Controller modifies current time.
https://bugs.webkit.org/show_bug.cgi?id=129042
Patch by Piotr Grad <p.grad@samsung.com> on 2014-02-19
Reviewed by Jer Noble.
Source/WebCore:
In ClockGeneric: when setting playback rate or stoping timer,clock was restarted using current real time
instead of provided time by setCurrentTime.
Changed impl. so that m_offset is updated when clock stops to remember last clock position.
When playbackRate is changed m_offset is updated in order to not use old time interval for new playback rate.
Test: media/video-controller-currentTime-rate.html
* html/MediaController.cpp:
(MediaController::updatePlaybackState):
* platform/ClockGeneric.cpp:
(ClockGeneric::setPlayRate):
(ClockGeneric::start):
(ClockGeneric::stop):
LayoutTests:
* media/video-controller-currentTime-rate-expected.txt: Added.
* media/video-controller-currentTime-rate.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaControllercpp">trunk/Source/WebCore/html/MediaController.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformClockGenericcpp">trunk/Source/WebCore/platform/ClockGeneric.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediavideocontrollercurrentTimerateexpectedtxt">trunk/LayoutTests/media/video-controller-currentTime-rate-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediavideocontrollercurrentTimeratehtml">trunk/LayoutTests/media/video-controller-currentTime-rate.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164364 => 164365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-19 17:05:07 UTC (rev 164364)
+++ trunk/LayoutTests/ChangeLog 2014-02-19 17:24:47 UTC (rev 164365)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-02-19 Piotr Grad <p.grad@samsung.com>
+
+ Setting playback rate on Media Controller modifies current time.
+ https://bugs.webkit.org/show_bug.cgi?id=129042
+
+ Reviewed by Jer Noble.
+
+ * media/video-controller-currentTime-rate-expected.txt: Added.
+ * media/video-controller-currentTime-rate.html: Added.
+
</ins><span class="cx"> 2014-02-19 Bem Jones-Bey <bjonesbe@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Shapes] shape-outside does not properly handle different writing modes
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideocontrollercurrentTimerateexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-controller-currentTime-rate-expected.txt (0 => 164365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-controller-currentTime-rate-expected.txt (rev 0)
+++ trunk/LayoutTests/media/video-controller-currentTime-rate-expected.txt 2014-02-19 17:24:47 UTC (rev 164365)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+
+Test that setting playbackRate on media controller modifies current time
+
+EVENT(canplaythrough)
+EXPECTED (0 == '0') OK
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediavideocontrollercurrentTimeratehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-controller-currentTime-rate.html (0 => 164365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-controller-currentTime-rate.html (rev 0)
+++ trunk/LayoutTests/media/video-controller-currentTime-rate.html 2014-02-19 17:24:47 UTC (rev 164365)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
+ <script>
+ function start()
+ {
+ findMediaElement();
+ video.src = findMediaFile("video", "content/test");
+ waitForEventOnce('canplaythrough', canPlayThrough);
+ }
+
+ function canPlayThrough()
+ {
+ video.controller.currentTime = 0;
+ video.controller.playbackRate = 1.01;
+ testExpected(video.controller.currentTime, 0, "==");
+ endTest();
+ }
+ </script>
+ </head>
+ <body onload="start()">
+ <video mediaGroup="group"></video>
+ <p>Test that setting playbackRate on media controller modifies current time</p>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164364 => 164365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-19 17:05:07 UTC (rev 164364)
+++ trunk/Source/WebCore/ChangeLog 2014-02-19 17:24:47 UTC (rev 164365)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-02-19 Piotr Grad <p.grad@samsung.com>
+
+ Setting playback rate on Media Controller modifies current time.
+ https://bugs.webkit.org/show_bug.cgi?id=129042
+
+ Reviewed by Jer Noble.
+
+ In ClockGeneric: when setting playback rate or stoping timer,clock was restarted using current real time
+ instead of provided time by setCurrentTime.
+ Changed impl. so that m_offset is updated when clock stops to remember last clock position.
+ When playbackRate is changed m_offset is updated in order to not use old time interval for new playback rate.
+
+ Test: media/video-controller-currentTime-rate.html
+
+ * html/MediaController.cpp:
+ (MediaController::updatePlaybackState):
+ * platform/ClockGeneric.cpp:
+ (ClockGeneric::setPlayRate):
+ (ClockGeneric::start):
+ (ClockGeneric::stop):
+
</ins><span class="cx"> 2014-02-19 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Add settings/preferences for enabling image controls
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaController.cpp (164364 => 164365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaController.cpp 2014-02-19 17:05:07 UTC (rev 164364)
+++ trunk/Source/WebCore/html/MediaController.cpp 2014-02-19 17:24:47 UTC (rev 164365)
</span><span class="lines">@@ -446,6 +446,7 @@
</span><span class="cx"> case ENDED:
</span><span class="cx"> eventName = eventNames().endedEvent;
</span><span class="cx"> m_clock->stop();
</span><ins>+ m_clock->setCurrentTime(0);
</ins><span class="cx"> m_timeupdateTimer.stop();
</span><span class="cx"> break;
</span><span class="cx"> case PLAYING:
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformClockGenericcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ClockGeneric.cpp (164364 => 164365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ClockGeneric.cpp 2014-02-19 17:05:07 UTC (rev 164364)
+++ trunk/Source/WebCore/platform/ClockGeneric.cpp 2014-02-19 17:24:47 UTC (rev 164365)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> void ClockGeneric::setPlayRate(double rate)
</span><span class="cx"> {
</span><del>- m_offset = now();
</del><ins>+ m_offset = currentTime();
</ins><span class="cx"> m_lastTime = m_startTime = now();
</span><span class="cx"> m_rate = rate;
</span><span class="cx"> }
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> if (!m_running)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_offset = now();
</del><ins>+ m_offset = currentTime();
</ins><span class="cx"> m_lastTime = m_startTime = now();
</span><span class="cx"> m_running = false;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>