<!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>[190114] 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/190114">190114</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-22 06:59:38 -0700 (Tue, 22 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebCore:
CurrentTime on mediaController is set as 0 when playback is completed.
https://bugs.webkit.org/show_bug.cgi?id=149154
Patch by sangdeug.kim <sangdeug.kim@samsung.com> on 2015-09-22
Reviewed by Eric Carlson.
Test : media/media-controller-time-clamp.html
* html/MediaController.cpp:
(MediaController::setCurrentTime):
(MediaController::updatePlaybackState):
* html/MediaController.h:
LayoutTests:
Add test for checking currentTime of mediacontroller when playback is completed.
https://bugs.webkit.org/show_bug.cgi?id=149154
Patch by sangdeug.kim <sangdeug.kim@samsung.com> on 2015-09-22
Reviewed by Eric Carlson.
* media/media-controller-time-clamp-expected.txt:
* media/media-controller-time-clamp.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediamediacontrollertimeclampexpectedtxt">trunk/LayoutTests/media/media-controller-time-clamp-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamediacontrollertimeclamphtml">trunk/LayoutTests/media/media-controller-time-clamp.html</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="#trunkSourceWebCorehtmlMediaControllerh">trunk/Source/WebCore/html/MediaController.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (190113 => 190114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-09-22 12:21:31 UTC (rev 190113)
+++ trunk/LayoutTests/ChangeLog 2015-09-22 13:59:38 UTC (rev 190114)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-09-22 sangdeug.kim <sangdeug.kim@samsung.com>
+
+ Add test for checking currentTime of mediacontroller when playback is completed.
+ https://bugs.webkit.org/show_bug.cgi?id=149154
+
+ Reviewed by Eric Carlson.
+
+ * media/media-controller-time-clamp-expected.txt:
+ * media/media-controller-time-clamp.html:
+
</ins><span class="cx"> 2015-09-22 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: update Esprima to latest version
</span></span></pre></div>
<a id="trunkLayoutTestsmediamediacontrollertimeclampexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/media-controller-time-clamp-expected.txt (190113 => 190114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-controller-time-clamp-expected.txt 2015-09-22 12:21:31 UTC (rev 190113)
+++ trunk/LayoutTests/media/media-controller-time-clamp-expected.txt 2015-09-22 13:59:38 UTC (rev 190114)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx"> RUN(video.play())
</span><span class="cx"> RUN(controller.play())
</span><span class="cx"> EVENT(ended)
</span><ins>+EXPECTED (controller.currentTime > '0') OK
</ins><span class="cx"> EXPECTED (controller.currentTime <= controller.duration == 'true') OK
</span><span class="cx"> END OF TEST
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmediamediacontrollertimeclamphtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/media-controller-time-clamp.html (190113 => 190114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-controller-time-clamp.html 2015-09-22 12:21:31 UTC (rev 190113)
+++ trunk/LayoutTests/media/media-controller-time-clamp.html 2015-09-22 13:59:38 UTC (rev 190114)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> function ended() {
</span><span class="cx"> consoleWrite("EVENT(ended)");
</span><ins>+ testExpected("controller.currentTime", 0, ">");
</ins><span class="cx"> testExpected("controller.currentTime <= controller.duration", true);
</span><span class="cx"> endTest();
</span><span class="cx"> }
</span><span class="lines">@@ -36,4 +37,4 @@
</span><span class="cx"> <body onload="start()">
</span><span class="cx"> <video id="video" mediaGroup="group" controls></video>
</span><span class="cx"> </body>
</span><del>-</html>
</del><span class="cx">\ No newline at end of file
</span><ins>+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190113 => 190114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-22 12:21:31 UTC (rev 190113)
+++ trunk/Source/WebCore/ChangeLog 2015-09-22 13:59:38 UTC (rev 190114)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-09-22 sangdeug.kim <sangdeug.kim@samsung.com>
+
+ CurrentTime on mediaController is set as 0 when playback is completed.
+ https://bugs.webkit.org/show_bug.cgi?id=149154
+
+ Reviewed by Eric Carlson.
+
+ Test : media/media-controller-time-clamp.html
+
+ * html/MediaController.cpp:
+ (MediaController::setCurrentTime):
+ (MediaController::updatePlaybackState):
+ * html/MediaController.h:
+
</ins><span class="cx"> 2015-09-22 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r189616.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaController.cpp (190113 => 190114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaController.cpp 2015-09-22 12:21:31 UTC (rev 190113)
+++ trunk/Source/WebCore/html/MediaController.cpp 2015-09-22 13:59:38 UTC (rev 190114)
</span><span class="lines">@@ -174,6 +174,7 @@
</span><span class="cx"> m_mediaElements[index]->seek(MediaTime::createWithDouble(time));
</span><span class="cx">
</span><span class="cx"> scheduleTimeupdateEvent();
</span><ins>+ m_resetCurrentTimeInNextPlay = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaController::unpause()
</span><span class="lines">@@ -445,11 +446,15 @@
</span><span class="cx"> break;
</span><span class="cx"> case ENDED:
</span><span class="cx"> eventName = eventNames().endedEvent;
</span><ins>+ m_resetCurrentTimeInNextPlay = true;
</ins><span class="cx"> m_clock->stop();
</span><del>- m_clock->setCurrentTime(0);
</del><span class="cx"> m_timeupdateTimer.stop();
</span><span class="cx"> break;
</span><span class="cx"> case PLAYING:
</span><ins>+ if (m_resetCurrentTimeInNextPlay) {
+ m_resetCurrentTimeInNextPlay = false;
+ m_clock->setCurrentTime(0);
+ }
</ins><span class="cx"> eventName = eventNames().playingEvent;
</span><span class="cx"> m_clock->start();
</span><span class="cx"> startTimeupdateTimer();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaController.h (190113 => 190114)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaController.h 2015-09-22 12:21:31 UTC (rev 190113)
+++ trunk/Source/WebCore/html/MediaController.h 2015-09-22 13:59:38 UTC (rev 190114)
</span><span class="lines">@@ -154,6 +154,7 @@
</span><span class="cx"> ScriptExecutionContext& m_scriptExecutionContext;
</span><span class="cx"> Timer m_timeupdateTimer;
</span><span class="cx"> double m_previousTimeupdateTime;
</span><ins>+ bool m_resetCurrentTimeInNextPlay { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>