<!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>[158965] 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/158965">158965</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-11-08 15:45:22 -0800 (Fri, 08 Nov 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Ended event should work also when playback rate is negative
https://bugs.webkit.org/show_bug.cgi?id=123879

Patch by Piotr Grad &lt;p.grad@samsung.com&gt; on 2013-11-08
Reviewed by Eric Carlson.

Source/WebCore:

According to W3C specification playback is ended also when playback rate is
negative and position is the earliest possible position.

Test: media/video-ended-event-negative-playback.html

* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::mediaPlayerTimeChanged):

LayoutTests:

Tests if ended event is triggered for audio/video elements after
changing playback rate to negative.

* media/video-ended-event-negative-playback-expected.txt: Added.
* media/video-ended-event-negative-playback.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>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediavideoendedeventnegativeplaybackexpectedtxt">trunk/LayoutTests/media/video-ended-event-negative-playback-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediavideoendedeventnegativeplaybackhtml">trunk/LayoutTests/media/video-ended-event-negative-playback.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (158964 => 158965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2013-11-08 23:36:31 UTC (rev 158964)
+++ trunk/LayoutTests/ChangeLog        2013-11-08 23:45:22 UTC (rev 158965)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2013-11-08  Piotr Grad  &lt;p.grad@samsung.com&gt;
+
+        Ended event should work also when playback rate is negative
+        https://bugs.webkit.org/show_bug.cgi?id=123879
+
+        Reviewed by Eric Carlson.
+
+        Tests if ended event is triggered for audio/video elements after
+        changing playback rate to negative.
+
+        * media/video-ended-event-negative-playback-expected.txt: Added.
+        * media/video-ended-event-negative-playback.html: Added.
+
</ins><span class="cx"> 2013-11-08  Thiago de Barros Lacerda  &lt;thiago.lacerda@openbossa.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Checking for TypeError in RTCPeerConnection object creation
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideoendedeventnegativeplaybackexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-ended-event-negative-playback-expected.txt (0 => 158965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-ended-event-negative-playback-expected.txt                                (rev 0)
+++ trunk/LayoutTests/media/video-ended-event-negative-playback-expected.txt        2013-11-08 23:45:22 UTC (rev 158965)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+
+EVENT(canplaythrough)
+EVENT(ended)
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediavideoendedeventnegativeplaybackhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-ended-event-negative-playback.html (0 => 158965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-ended-event-negative-playback.html                                (rev 0)
+++ trunk/LayoutTests/media/video-ended-event-negative-playback.html        2013-11-08 23:45:22 UTC (rev 158965)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+&lt;html&gt;
+    &lt;head&gt;
+        &lt;script src=media-file.js&gt;&lt;/script&gt;
+        &lt;script src=video-test.js&gt;&lt;/script&gt;
+        &lt;script&gt;
+            function start() {
+                findMediaElement();
+                waitForEventAndEnd('ended');
+                video.src = findMediaFile(&quot;video&quot;, &quot;content/test&quot;);
+                waitForEventOnce('canplaythrough',
+                    function ()
+                    {
+                        video.currentTime = 0.5;
+                        video.playbackRate = -1;
+                        video.play();
+                        failTestIn(2500);
+                    });
+                }
+        &lt;/script&gt;
+    &lt;/head&gt;
+    &lt;body onload=&quot;start()&quot;&gt;
+        &lt;video loop /&gt;
+    &lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (158964 => 158965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-11-08 23:36:31 UTC (rev 158964)
+++ trunk/Source/WebCore/ChangeLog        2013-11-08 23:45:22 UTC (rev 158965)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2013-11-08  Piotr Grad  &lt;p.grad@samsung.com&gt;
+
+        Ended event should work also when playback rate is negative
+        https://bugs.webkit.org/show_bug.cgi?id=123879
+
+        Reviewed by Eric Carlson.
+
+        According to W3C specification playback is ended also when playback rate is
+        negative and position is the earliest possible position.
+
+        Test: media/video-ended-event-negative-playback.html
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::mediaPlayerTimeChanged):
+
</ins><span class="cx"> 2013-11-08  Thiago de Barros Lacerda  &lt;thiago.lacerda@openbossa.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Checking for TypeError in RTCPeerConnection object creation
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (158964 => 158965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp        2013-11-08 23:36:31 UTC (rev 158964)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp        2013-11-08 23:45:22 UTC (rev 158965)
</span><span class="lines">@@ -3663,18 +3663,18 @@
</span><span class="cx">     double now = currentTime();
</span><span class="cx">     double dur = duration();
</span><span class="cx">     
</span><del>-    // When the current playback position reaches the end of the media resource when the direction of
-    // playback is forwards, then the user agent must follow these steps:
-    if (!std::isnan(dur) &amp;&amp; dur &amp;&amp; now &gt;= dur &amp;&amp; m_playbackRate &gt; 0) {
</del><ins>+    // When the current playback position reaches the end of the media resource then the user agent must follow these steps:
+    if (!std::isnan(dur) &amp;&amp; dur) {
</ins><span class="cx">         // If the media element has a loop attribute specified and does not have a current media controller,
</span><del>-        if (loop() &amp;&amp; !m_mediaController) {
</del><ins>+        if (loop() &amp;&amp; !m_mediaController &amp;&amp; m_playbackRate &gt; 0) {
</ins><span class="cx">             m_sentEndEvent = false;
</span><del>-            //  then seek to the earliest possible position of the media resource and abort these steps.
-            seek(0, IGNORE_EXCEPTION);
-        } else {
</del><ins>+            // then seek to the earliest possible position of the media resource and abort these steps when the direction of
+            // playback is forwards,
+            if (now &gt;= dur)
+                seek(0, IGNORE_EXCEPTION);
+        } else if ((now &lt;= 0 &amp;&amp; m_playbackRate &lt; 0) || (now &gt;= dur &amp;&amp; m_playbackRate &gt; 0)) {
</ins><span class="cx">             // If the media element does not have a current media controller, and the media element
</span><del>-            // has still ended playback, and the direction of playback is still forwards, and paused
-            // is false,
</del><ins>+            // has still ended playback and paused is false,
</ins><span class="cx">             if (!m_mediaController &amp;&amp; !m_paused) {
</span><span class="cx">                 // changes paused to true and fires a simple event named pause at the media element.
</span><span class="cx">                 m_paused = true;
</span><span class="lines">@@ -3688,7 +3688,8 @@
</span><span class="cx">             // If the media element has a current media controller, then report the controller state
</span><span class="cx">             // for the media element's current media controller.
</span><span class="cx">             updateMediaController();
</span><del>-        }
</del><ins>+        } else
+            m_sentEndEvent = false;
</ins><span class="cx">     }
</span><span class="cx">     else
</span><span class="cx">         m_sentEndEvent = false;
</span></span></pre>
</div>
</div>

</body>
</html>