<!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>[168996] 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/168996">168996</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-17 14:36:15 -0700 (Sat, 17 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Setting playback rate on video with media controller is not ignored.
https://bugs.webkit.org/show_bug.cgi?id=129048
Patch by Piotr Grad <p.grad@samsung.com> on 2014-05-17
Reviewed by Jer Noble.
Source/WebCore:
Replaced queries for m_playbackRate with effectivePlaybackRate()
which includes media controller playback rate.
Test: media/video-controller-child-rate.html
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::parseAttribute):
* html/HTMLMediaElement.h:
LayoutTests:
* media/video-controller-child-rate-expected.txt: Added.
* media/video-controller-child-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="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediavideocontrollerchildrateexpectedtxt">trunk/LayoutTests/media/video-controller-child-rate-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediavideocontrollerchildratehtml">trunk/LayoutTests/media/video-controller-child-rate.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (168995 => 168996)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-17 20:14:18 UTC (rev 168995)
+++ trunk/LayoutTests/ChangeLog 2014-05-17 21:36:15 UTC (rev 168996)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-05-17 Piotr Grad <p.grad@samsung.com>
+
+ Setting playback rate on video with media controller is not ignored.
+ https://bugs.webkit.org/show_bug.cgi?id=129048
+
+ Reviewed by Jer Noble.
+
+ * media/video-controller-child-rate-expected.txt: Added.
+ * media/video-controller-child-rate.html: Added.
+
</ins><span class="cx"> 2014-05-16 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix a straggler.
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideocontrollerchildrateexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-controller-child-rate-expected.txt (0 => 168996)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-controller-child-rate-expected.txt (rev 0)
+++ trunk/LayoutTests/media/video-controller-child-rate-expected.txt 2014-05-17 21:36:15 UTC (rev 168996)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+
+Test that setting playbackRate on video with controller is ignored.
+
+EVENT(canplaythrough)
+EVENT(playing)
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediavideocontrollerchildratehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-controller-child-rate.html (0 => 168996)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-controller-child-rate.html (rev 0)
+++ trunk/LayoutTests/media/video-controller-child-rate.html 2014-05-17 21:36:15 UTC (rev 168996)
</span><span class="lines">@@ -0,0 +1,57 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
+ <script>
+ var videoLastTime;
+ var lastRealTime;
+ var iteration = 0;
+
+ function start()
+ {
+ findMediaElement();
+ video.src = findMediaFile("video", "content/test");
+ waitForEventOnce('canplaythrough', canPlayThrough);
+ }
+
+ function canPlayThrough()
+ {
+ video.playbackRate = 4;
+ waitForEventOnce('playing', playing);
+ video.play();
+ }
+
+ function playing()
+ {
+ videoLastTime = video.currentTime;
+ lastRealTime = new Date();
+ video.addEventListener('timeupdate', timeupdate);
+ }
+
+ function timeupdate()
+ {
+ var videoTimeDelta = video.currentTime - videoLastTime;
+ var realTimeDelta = (new Date() - lastRealTime) / 1000;
+ if (Math.abs(videoTimeDelta - realTimeDelta) < realTimeDelta / 10 ) {
+ video.removeEventListener('timeupdate', timeupdate, true);
+ endTest();
+ return;
+ }
+
+ if (iteration > 3) {
+ failTest("Playback rate was applied directly to video with media controller.");
+ return;
+ }
+
+ videoLastTime = video.currentTime;
+ lastRealTime = new Date();
+ iteration++;
+ }
+ </script>
+ </head>
+ <body onload="start()">
+ <video mediaGroup="group"></video>
+ <p>Test that setting playbackRate on video with controller is ignored.</p>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168995 => 168996)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-17 20:14:18 UTC (rev 168995)
+++ trunk/Source/WebCore/ChangeLog 2014-05-17 21:36:15 UTC (rev 168996)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-05-17 Piotr Grad <p.grad@samsung.com>
+
+ Setting playback rate on video with media controller is not ignored.
+ https://bugs.webkit.org/show_bug.cgi?id=129048
+
+ Reviewed by Jer Noble.
+
+ Replaced queries for m_playbackRate with effectivePlaybackRate()
+ which includes media controller playback rate.
+
+ Test: media/video-controller-child-rate.html
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::parseAttribute):
+ * html/HTMLMediaElement.h:
+
</ins><span class="cx"> 2014-05-16 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Expose WKUserScript as API
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (168995 => 168996)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-05-17 20:14:18 UTC (rev 168995)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-05-17 21:36:15 UTC (rev 168996)
</span><span class="lines">@@ -2535,7 +2535,7 @@
</span><span class="cx">
</span><span class="cx"> // Not too soon, use the cached time only if it hasn't expired.
</span><span class="cx"> if (clockDelta < maximumDurationToCacheMediaTime) {
</span><del>- double adjustedCacheTime = m_cachedTime + (m_playbackRate * clockDelta);
</del><ins>+ double adjustedCacheTime = m_cachedTime + (effectivePlaybackRate() * clockDelta);
</ins><span class="cx">
</span><span class="cx"> #if LOG_CACHED_TIME_WARNINGS
</span><span class="cx"> double delta = adjustedCacheTime - m_player->currentTime();
</span><span class="lines">@@ -2549,7 +2549,7 @@
</span><span class="cx"> #if LOG_CACHED_TIME_WARNINGS
</span><span class="cx"> if (maximumDurationToCacheMediaTime && now > m_minimumClockTimeToUpdateCachedTime && m_cachedTime != MediaPlayer::invalidTime()) {
</span><span class="cx"> double clockDelta = now - m_clockTimeAtLastCachedTimeUpdate;
</span><del>- double delta = m_cachedTime + (m_playbackRate * clockDelta) - m_player->currentTime();
</del><ins>+ double delta = m_cachedTime + (effectivePlaybackRate() * clockDelta) - m_player->currentTime();
</ins><span class="cx"> LOG(Media, "HTMLMediaElement::currentTime - cached time was %f seconds off of media time when it expired", delta);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -2615,6 +2615,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+double HTMLMediaElement::effectivePlaybackRate() const
+{
+ return m_mediaController ? m_mediaController->playbackRate() : m_playbackRate;
+}
+
</ins><span class="cx"> double HTMLMediaElement::playbackRate() const
</span><span class="cx"> {
</span><span class="cx"> return m_playbackRate;
</span><span class="lines">@@ -2636,7 +2641,7 @@
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::updatePlaybackRate()
</span><span class="cx"> {
</span><del>- double effectiveRate = m_mediaController ? m_mediaController->playbackRate() : m_playbackRate;
</del><ins>+ double effectiveRate = effectivePlaybackRate();
</ins><span class="cx"> if (m_player && potentiallyPlaying() && m_player->rate() != effectiveRate)
</span><span class="cx"> m_player->setRate(effectiveRate);
</span><span class="cx"> }
</span><span class="lines">@@ -2663,7 +2668,7 @@
</span><span class="cx"> // 4.8.10.8 Playing the media resource
</span><span class="cx"> // The ended attribute must return true if the media element has ended
</span><span class="cx"> // playback and the direction of playback is forwards, and false otherwise.
</span><del>- return endedPlayback() && m_playbackRate > 0;
</del><ins>+ return endedPlayback() && effectivePlaybackRate() > 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTMLMediaElement::autoplay() const
</span><span class="lines">@@ -3100,7 +3105,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_player);
</span><span class="cx">
</span><del>- if (m_fragmentEndTime != MediaPlayer::invalidTime() && currentTime() >= m_fragmentEndTime && m_playbackRate > 0) {
</del><ins>+ if (m_fragmentEndTime != MediaPlayer::invalidTime() && currentTime() >= m_fragmentEndTime && effectivePlaybackRate() > 0) {
</ins><span class="cx"> m_fragmentEndTime = MediaPlayer::invalidTime();
</span><span class="cx"> if (!m_mediaController && !m_paused) {
</span><span class="cx"> // changes paused to true and fires a simple event named pause at the media element.
</span><span class="lines">@@ -3110,7 +3115,7 @@
</span><span class="cx">
</span><span class="cx"> scheduleTimeupdateEvent(true);
</span><span class="cx">
</span><del>- if (!m_playbackRate)
</del><ins>+ if (!effectivePlaybackRate())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!m_paused && hasMediaControls())
</span><span class="lines">@@ -4032,17 +4037,18 @@
</span><span class="cx">
</span><span class="cx"> double now = currentTime();
</span><span class="cx"> double dur = duration();
</span><ins>+ double playbackRate = effectivePlaybackRate();
</ins><span class="cx">
</span><span class="cx"> // When the current playback position reaches the end of the media resource then the user agent must follow these steps:
</span><span class="cx"> if (!std::isnan(dur) && dur) {
</span><span class="cx"> // If the media element has a loop attribute specified and does not have a current media controller,
</span><del>- if (loop() && !m_mediaController && m_playbackRate > 0) {
</del><ins>+ if (loop() && !m_mediaController && playbackRate > 0) {
</ins><span class="cx"> m_sentEndEvent = false;
</span><span class="cx"> // then seek to the earliest possible position of the media resource and abort these steps when the direction of
</span><span class="cx"> // playback is forwards,
</span><span class="cx"> if (now >= dur)
</span><span class="cx"> seek(0);
</span><del>- } else if ((now <= 0 && m_playbackRate < 0) || (now >= dur && m_playbackRate > 0)) {
</del><ins>+ } else if ((now <= 0 && playbackRate < 0) || (now >= dur && playbackRate > 0)) {
</ins><span class="cx"> // If the media element does not have a current media controller, and the media element
</span><span class="cx"> // has still ended playback and paused is false,
</span><span class="cx"> if (!m_mediaController && !m_paused) {
</span><span class="lines">@@ -4352,12 +4358,12 @@
</span><span class="cx"> // of playback is forwards, Either the media element does not have a loop attribute specified,
</span><span class="cx"> // or the media element has a current media controller.
</span><span class="cx"> double now = currentTime();
</span><del>- if (m_playbackRate > 0)
</del><ins>+ if (effectivePlaybackRate() > 0)
</ins><span class="cx"> return dur > 0 && now >= dur && (!loop() || m_mediaController);
</span><span class="cx">
</span><span class="cx"> // or the current playback position is the earliest possible position and the direction
</span><span class="cx"> // of playback is backwards
</span><del>- if (m_playbackRate < 0)
</del><ins>+ if (effectivePlaybackRate() < 0)
</ins><span class="cx"> return now <= 0;
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="lines">@@ -4460,7 +4466,7 @@
</span><span class="cx">
</span><span class="cx"> // Set rate, muted before calling play in case they were set before the media engine was setup.
</span><span class="cx"> // The media engine should just stash the rate and muted values since it isn't already playing.
</span><del>- m_player->setRate(m_playbackRate);
</del><ins>+ m_player->setRate(effectivePlaybackRate());
</ins><span class="cx"> m_player->setMuted(muted());
</span><span class="cx">
</span><span class="cx"> m_player->play();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (168995 => 168996)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2014-05-17 20:14:18 UTC (rev 168995)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2014-05-17 21:36:15 UTC (rev 168996)
</span><span class="lines">@@ -500,6 +500,8 @@
</span><span class="cx"> void setReadyState(MediaPlayer::ReadyState);
</span><span class="cx"> void setNetworkState(MediaPlayer::NetworkState);
</span><span class="cx">
</span><ins>+ double effectivePlaybackRate() const;
+
</ins><span class="cx"> virtual Document* mediaPlayerOwningDocument() override;
</span><span class="cx"> virtual void mediaPlayerNetworkStateChanged(MediaPlayer*) override;
</span><span class="cx"> virtual void mediaPlayerReadyStateChanged(MediaPlayer*) override;
</span></span></pre>
</div>
</div>
</body>
</html>