<!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>[180310] branches/safari-600.4.10-branch</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/180310">180310</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-02-18 15:19:20 -0800 (Wed, 18 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/178426">r178426</a>. rdar://problem/19585771</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari600410branchLayoutTestsChangeLog">branches/safari-600.4.10-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari600410branchSourceWebCoreChangeLog">branches/safari-600.4.10-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari600410branchSourceWebCorehtmlHTMLMediaElementcpp">branches/safari-600.4.10-branch/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari600410branchLayoutTestsmediavideoendedseekcrashexpectedtxt">branches/safari-600.4.10-branch/LayoutTests/media/video-ended-seek-crash-expected.txt</a></li>
<li><a href="#branchessafari600410branchLayoutTestsmediavideoendedseekcrashhtml">branches/safari-600.4.10-branch/LayoutTests/media/video-ended-seek-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari600410branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4.10-branch/LayoutTests/ChangeLog (180309 => 180310)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4.10-branch/LayoutTests/ChangeLog        2015-02-18 23:14:36 UTC (rev 180309)
+++ branches/safari-600.4.10-branch/LayoutTests/ChangeLog        2015-02-18 23:19:20 UTC (rev 180310)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2015-02-18 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r178426
+
+ 2015-01-14 Jer Noble <jer.noble@apple.com>
+
+ Null-deref crash when seeking immediately before looping.
+ https://bugs.webkit.org/show_bug.cgi?id=140394
+
+ Reviewed by Eric Carlson.
+
+ * media/video-ended-seek-crash-expected.txt: Added.
+ * media/video-ended-seek-crash.html: Added.
+
+2015-02-18 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r178363
</span><span class="cx">
</span><span class="cx"> 2015-01-13 Andreas Kling <akling@apple.com>
</span></span></pre></div>
<a id="branchessafari600410branchLayoutTestsmediavideoendedseekcrashexpectedtxtfromrev178426trunkLayoutTestsmediavideoendedseekcrashexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-600.4.10-branch/LayoutTests/media/video-ended-seek-crash-expected.txt (from rev 178426, trunk/LayoutTests/media/video-ended-seek-crash-expected.txt) (0 => 180310)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4.10-branch/LayoutTests/media/video-ended-seek-crash-expected.txt         (rev 0)
+++ branches/safari-600.4.10-branch/LayoutTests/media/video-ended-seek-crash-expected.txt        2015-02-18 23:19:20 UTC (rev 180310)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+
+EVENT(canplaythrough)
+RUN(video.currentTime = video.duration - 0.1)
+RUN(video.play())
+EVENT(ended)
+RUN(video.setAttribute("loop", "loop"))
+RUN(video.currentTime = 0)
+RUN(video.play())
+EVENT(seeked)
+END OF TEST
+
</ins></span></pre></div>
<a id="branchessafari600410branchLayoutTestsmediavideoendedseekcrashhtmlfromrev178426trunkLayoutTestsmediavideoendedseekcrashhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.4.10-branch/LayoutTests/media/video-ended-seek-crash.html (from rev 178426, trunk/LayoutTests/media/video-ended-seek-crash.html) (0 => 180310)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4.10-branch/LayoutTests/media/video-ended-seek-crash.html         (rev 0)
+++ branches/safari-600.4.10-branch/LayoutTests/media/video-ended-seek-crash.html        2015-02-18 23:19:20 UTC (rev 180310)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <title>video-ended-seek-crash</title>
+ <script src="video-test.js"></script>
+ <script src="media-file.js"></script>
+ <script>
+ function startTest()
+ {
+ findMediaElement();
+ waitForEventOnce('canplaythrough', canPlayThrough);
+ video.src = findMediaFile('video', 'content/test');
+ }
+
+ function canPlayThrough()
+ {
+ waitForEventOnce('ended', ended);
+ run('video.currentTime = video.duration - 0.1');
+ run('video.play()');
+ }
+
+ function ended()
+ {
+ waitForEventOnce('seeked', seekedToBeginning);
+ run('video.setAttribute("loop", "loop")');
+ run('video.currentTime = 0');
+ run('video.play()');
+ }
+
+ function seekedToBeginning()
+ {
+ endTest();
+ }
+ </script>
+</head>
+<body onload="startTest()">
+ <video controls></video>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari600410branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4.10-branch/Source/WebCore/ChangeLog (180309 => 180310)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4.10-branch/Source/WebCore/ChangeLog        2015-02-18 23:14:36 UTC (rev 180309)
+++ branches/safari-600.4.10-branch/Source/WebCore/ChangeLog        2015-02-18 23:19:20 UTC (rev 180310)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2015-02-18 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r178426
+
+ 2015-01-14 Jer Noble <jer.noble@apple.com>
+
+ Null-deref crash when seeking immediately before looping.
+ https://bugs.webkit.org/show_bug.cgi?id=140394
+
+ Reviewed by Eric Carlson.
+
+ It is possible for finishSeek() to be called when a seek() has caused a pending seek task
+ to be scheduled, but before that pending seek task is run. In this case, if a seek request
+ is issued, the existing pending seek task will not be cancelled, which will cause a crash
+ when the pending seek task is run.
+
+ When checking whether an existing seek task needs to be cancelled, check the actual timer,
+ rather than the m_seeking boolean, so that this case is covered.
+
+ Test: media/video-ended-seek-crash.html
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::seekWithTolerance):
+
+2015-02-18 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r178363
</span><span class="cx">
</span><span class="cx"> 2015-01-13 Andreas Kling <akling@apple.com>
</span></span></pre></div>
<a id="branchessafari600410branchSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4.10-branch/Source/WebCore/html/HTMLMediaElement.cpp (180309 => 180310)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4.10-branch/Source/WebCore/html/HTMLMediaElement.cpp        2015-02-18 23:14:36 UTC (rev 180309)
+++ branches/safari-600.4.10-branch/Source/WebCore/html/HTMLMediaElement.cpp        2015-02-18 23:19:20 UTC (rev 180310)
</span><span class="lines">@@ -2363,7 +2363,7 @@
</span><span class="cx"> // 3 - If the element's seeking IDL attribute is true, then another instance of this algorithm is
</span><span class="cx"> // already running. Abort that other instance of the algorithm without waiting for the step that
</span><span class="cx"> // it is running to complete.
</span><del>- if (m_seeking) {
</del><ins>+ if (m_seekTimer.isActive()) {
</ins><span class="cx"> m_seekTimer.stop();
</span><span class="cx"> m_pendingSeek = nullptr;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>