<!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>[196897] releases/WebKitGTK/webkit-2.10</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/196897">196897</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-22 00:02:10 -0800 (Mon, 22 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/195540">r195540</a> - Media "ended" event incorrectly fires when currentTime is set
https://bugs.webkit.org/show_bug.cgi?id=150348
<rdar://problem/24247974>
Reviewed by Jer Noble.
Source/WebCore:
Test: media/media-ended-fired-once.html
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::invalidateCachedTime): Always mark m_cachedTime as invalid.
LayoutTests:
* media/media-ended-fired-once-expected.txt: Added.
* media/media-ended-fired-once.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorehtmlHTMLMediaElementcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsmediamediaendedfiredonceexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/media/media-ended-fired-once-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsmediamediaendedfiredoncehtml">releases/WebKitGTK/webkit-2.10/LayoutTests/media/media-ended-fired-once.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (196896 => 196897)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2016-02-22 07:29:35 UTC (rev 196896)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2016-02-22 08:02:10 UTC (rev 196897)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-01-25 Eric Carlson <eric.carlson@apple.com>
+
+ Media "ended" event incorrectly fires when currentTime is set
+ https://bugs.webkit.org/show_bug.cgi?id=150348
+ <rdar://problem/24247974>
+
+ Reviewed by Jer Noble.
+
+ * media/media-ended-fired-once-expected.txt: Added.
+ * media/media-ended-fired-once.html: Added.
+
</ins><span class="cx"> 2016-01-26 Mario Sanchez Prada <mario@endlessm.com>
</span><span class="cx">
</span><span class="cx"> [GTK] WebProcess crashes when quickly attempting many DnD operations
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsmediamediaendedfiredonceexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/media/media-ended-fired-once-expected.txt (0 => 196897)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/media/media-ended-fired-once-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/media/media-ended-fired-once-expected.txt 2016-02-22 08:02:10 UTC (rev 196897)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+
+Test 'ended' event by:
+
+Playing to the end.
+When 'ended' event fires, seek to 0.
+Verify that 'ended' event is not fired again.
+
+EVENT(canplaythrough)
+RUN(audio.currentTime = 1.0)
+RUN(audio.play())
+
+EVENT(ended)
+EXPECTED (audio.ended == 'true') OK
+RUN(audio.currentTime = 0)
+
+END OF TEST
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsmediamediaendedfiredoncehtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/media/media-ended-fired-once.html (0 => 196897)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/media/media-ended-fired-once.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/media/media-ended-fired-once.html 2016-02-22 08:02:10 UTC (rev 196897)
</span><span class="lines">@@ -0,0 +1,58 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <script src=media-file.js></script>
+ <script src=video-test.js></script>
+
+ <script>
+ var endedCount = 0;
+ var audio;
+
+ function start()
+ {
+ consoleWrite("");
+ audio = document.querySelector("audio");
+ waitForEvent("ended", ended);
+ waitForEvent("canplaythrough", canplaythrough);
+
+ audio.src = findMediaFile("audio", "content/silence")
+ }
+
+ function canplaythrough()
+ {
+ run("audio.currentTime = 1.0");
+ run("audio.play()");
+ consoleWrite("");
+ }
+
+ function ended()
+ {
+ switch (++endedCount)
+ {
+ case 1:
+ testExpected("audio.ended", true);
+
+ run("audio.currentTime = 0");
+ setTimeout(endTest, 200);
+
+ consoleWrite("");
+ break;
+ default:
+ consoleWrite("");
+ failTest("'ended' event fired again");
+ break;
+ }
+ }
+ </script>
+ </head>
+ <body onload="start()">
+ <audio controls></audio>
+ <p><b>Test 'ended' event by:</b>
+ <ol>
+ <li>Playing to the end.</li>
+ <li>When 'ended' event fires, seek to 0.</li>
+ <li>Verify that 'ended' event is not fired again.</li>
+ </ol>
+ </p>
+ </body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (196896 => 196897)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-02-22 07:29:35 UTC (rev 196896)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-02-22 08:02:10 UTC (rev 196897)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-01-25 Eric Carlson <eric.carlson@apple.com>
+
+ Media "ended" event incorrectly fires when currentTime is set
+ https://bugs.webkit.org/show_bug.cgi?id=150348
+ <rdar://problem/24247974>
+
+ Reviewed by Jer Noble.
+
+ Test: media/media-ended-fired-once.html
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::invalidateCachedTime): Always mark m_cachedTime as invalid.
+
</ins><span class="cx"> 2016-01-25 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r192773): [GTK] maps.google.com unresponsive/stalls since r192773
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/html/HTMLMediaElement.cpp (196896 => 196897)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/html/HTMLMediaElement.cpp 2016-02-22 07:29:35 UTC (rev 196896)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/html/HTMLMediaElement.cpp 2016-02-22 08:02:10 UTC (rev 196897)
</span><span class="lines">@@ -2653,6 +2653,7 @@
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::invalidateCachedTime() const
</span><span class="cx"> {
</span><ins>+ m_cachedTime = MediaTime::invalidTime();
</ins><span class="cx"> if (!m_player || !m_player->maximumDurationToCacheMediaTime())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -2667,7 +2668,6 @@
</span><span class="cx"> static const double minimumTimePlayingBeforeCacheSnapshot = 0.5;
</span><span class="cx">
</span><span class="cx"> m_minimumClockTimeToUpdateCachedTime = monotonicallyIncreasingTime() + minimumTimePlayingBeforeCacheSnapshot;
</span><del>- m_cachedTime = MediaTime::invalidTime();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // playback state
</span></span></pre>
</div>
</div>
</body>
</html>