<!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>[190054] 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/190054">190054</a></dd>
<dt>Author</dt> <dd>changseok.oh@collabora.com</dd>
<dt>Date</dt> <dd>2015-09-21 01:53:01 -0700 (Mon, 21 Sep 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>[GTK] media controls does not show up when playing video finishes.
https://bugs.webkit.org/show_bug.cgi?id=149112

Reviewed by Philippe Normand.

Source/WebCore:

GTK port does not show controls after playing video. This behavior is different
from what Mac port does. They do show controls when playing video finishes.
At least, we should update the timeline before showing it up not to show incorrect numbers
when reappearing.

Test: media/media-controls-timeline-updates-after-playing.html

* Modules/mediacontrols/mediaControlsBase.js:
(Controller.prototype.setPlaying):
(Controller.prototype.showControls):

LayoutTests:

* media/media-controls-timeline-updates-after-playing-expected.txt: Added.
* media/media-controls-timeline-updates-after-playing.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="#trunkSourceWebCoreModulesmediacontrolsmediaControlsBasejs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsBase.js</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamediacontrolstimelineupdatesafterplayingexpectedtxt">trunk/LayoutTests/media/media-controls-timeline-updates-after-playing-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamediacontrolstimelineupdatesafterplayinghtml">trunk/LayoutTests/media/media-controls-timeline-updates-after-playing.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (190053 => 190054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-09-21 08:37:25 UTC (rev 190053)
+++ trunk/LayoutTests/ChangeLog        2015-09-21 08:53:01 UTC (rev 190054)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2015-09-21  ChangSeok Oh  &lt;changseok.oh@collabora.com&gt;
</span><span class="cx"> 
</span><ins>+        [GTK] media controls does not show up when playing video finishes.
+        https://bugs.webkit.org/show_bug.cgi?id=149112
+
+        Reviewed by Philippe Normand.
+
+        * media/media-controls-timeline-updates-after-playing-expected.txt: Added.
+        * media/media-controls-timeline-updates-after-playing.html: Added.
+
+2015-09-21  ChangSeok Oh  &lt;changseok.oh@collabora.com&gt;
+
</ins><span class="cx">         [GTK] timeline is not updated after few seconds when mouse hovers on controls
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=149111
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsmediamediacontrolstimelineupdatesafterplayingexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/media-controls-timeline-updates-after-playing-expected.txt (0 => 190054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-controls-timeline-updates-after-playing-expected.txt                                (rev 0)
+++ trunk/LayoutTests/media/media-controls-timeline-updates-after-playing-expected.txt        2015-09-21 08:53:01 UTC (rev 190054)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+This tests if media controls shows up and timeline is accordingly updated after playing the video.
+
+
+EVENT(canplaythrough)
+EXPECTED (timeLineValue() == '0') OK
+RUN(video.fastSeek(video.duration - 1))
+EVENT(seeked)
+RUN(video.play())
+EVENT(play)
+EVENT(pause)
+TEST(Math.floor(video.currentTime * 100) / 100 == timeLineValue()) OK
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamediacontrolstimelineupdatesafterplayinghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/media-controls-timeline-updates-after-playing.html (0 => 190054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-controls-timeline-updates-after-playing.html                                (rev 0)
+++ trunk/LayoutTests/media/media-controls-timeline-updates-after-playing.html        2015-09-21 08:53:01 UTC (rev 190054)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;p&gt;This tests if media controls shows up and timeline is accordingly updated after playing the video.&lt;/p&gt;
+&lt;video controls&gt;&lt;/video&gt;
+&lt;script src=media-file.js&gt;&lt;/script&gt;
+&lt;script src=video-test.js&gt;&lt;/script&gt;
+&lt;script src=media-controls.js&gt;&lt;/script&gt;
+&lt;script&gt;
+function timeLineValue()
+{
+    var timeline = mediaControlsElement(internals.shadowRoot(video).firstChild.firstChild, '-webkit-media-controls-timeline');
+    if (!timeline)
+        throw &quot;Failed to find -webkit-media-controls-timeline&quot;;
+
+    return timeline.value;
+}
+
+function canplaythrough()
+{
+    if (!window.testRunner) {
+        endTest();
+        return;
+    }
+
+    testExpected(&quot;timeLineValue()&quot;, 0);
+    run('video.fastSeek(video.duration - 1)');
+}
+
+function seeked()
+{
+    run(&quot;video.play()&quot;);
+}
+
+function paused()
+{
+    // timeLineValue returns a two decimal value.
+    test(&quot;Math.floor(video.currentTime * 100) / 100 == timeLineValue()&quot;);
+    endTest();
+}
+
+var video;
+findMediaElement();
+video.src = findMediaFile(&quot;video&quot;, &quot;content/test&quot;);
+
+waitForEvent(&quot;canplaythrough&quot;, canplaythrough);
+waitForEvent(&quot;seeked&quot;, seeked);
+waitForEvent(&quot;play&quot;);
+waitForEvent(&quot;pause&quot;, paused);
+waitForEventAndFail(&quot;error&quot;);
+&lt;/script&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190053 => 190054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-09-21 08:37:25 UTC (rev 190053)
+++ trunk/Source/WebCore/ChangeLog        2015-09-21 08:53:01 UTC (rev 190054)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-09-21  ChangSeok Oh  &lt;changseok.oh@collabora.com&gt;
</span><span class="cx"> 
</span><ins>+        [GTK] media controls does not show up when playing video finishes.
+        https://bugs.webkit.org/show_bug.cgi?id=149112
+
+        Reviewed by Philippe Normand.
+
+        GTK port does not show controls after playing video. This behavior is different
+        from what Mac port does. They do show controls when playing video finishes.
+        At least, we should update the timeline before showing it up not to show incorrect numbers
+        when reappearing.
+
+        Test: media/media-controls-timeline-updates-after-playing.html
+
+        * Modules/mediacontrols/mediaControlsBase.js:
+        (Controller.prototype.setPlaying):
+        (Controller.prototype.showControls):
+
+2015-09-21  ChangSeok Oh  &lt;changseok.oh@collabora.com&gt;
+
</ins><span class="cx">         [GTK] timeline is not updated after few seconds when mouse hovers on controls
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=149111
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsBasejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsBase.js (190053 => 190054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsBase.js        2015-09-21 08:37:25 UTC (rev 190053)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsBase.js        2015-09-21 08:53:01 UTC (rev 190054)
</span><span class="lines">@@ -998,6 +998,7 @@
</span><span class="cx">             this.controls.panel.classList.add(this.ClassNames.paused);
</span><span class="cx">             this.controls.playButton.classList.add(this.ClassNames.paused);
</span><span class="cx">             this.controls.playButton.setAttribute('aria-label', this.UIString('Play'));
</span><ins>+            this.showControls();
</ins><span class="cx">         } else {
</span><span class="cx">             this.controls.panel.classList.remove(this.ClassNames.paused);
</span><span class="cx">             this.controls.playButton.classList.remove(this.ClassNames.paused);
</span><span class="lines">@@ -1013,6 +1014,7 @@
</span><span class="cx">         this.controls.panel.classList.add(this.ClassNames.show);
</span><span class="cx">         this.controls.panel.classList.remove(this.ClassNames.hidden);
</span><span class="cx"> 
</span><ins>+        this.updateTime();
</ins><span class="cx">         this.setNeedsTimelineMetricsUpdate();
</span><span class="cx">     },
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>