<!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>[209209] branches/safari-602-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/209209">209209</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-12-01 14:23:54 -0800 (Thu, 01 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/208825">r208825</a>. rdar://problem/29277338</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsChangeLog">branches/safari-602-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCorehtmlHTMLMediaElementcpp">branches/safari-602-branch/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsmediatrackaudiotrackaddremoveexpectedtxt">branches/safari-602-branch/LayoutTests/media/track/audio-track-add-remove-expected.txt</a></li>
<li><a href="#branchessafari602branchLayoutTestsmediatrackaudiotrackaddremovehtml">branches/safari-602-branch/LayoutTests/media/track/audio-track-add-remove.html</a></li>
<li><a href="#branchessafari602branchLayoutTestsmediatrackvideotrackaddremoveexpectedtxt">branches/safari-602-branch/LayoutTests/media/track/video-track-add-remove-expected.txt</a></li>
<li><a href="#branchessafari602branchLayoutTestsmediatrackvideotrackaddremovehtml">branches/safari-602-branch/LayoutTests/media/track/video-track-add-remove.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/ChangeLog (209208 => 209209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/ChangeLog 2016-12-01 22:23:50 UTC (rev 209208)
+++ branches/safari-602-branch/LayoutTests/ChangeLog 2016-12-01 22:23:54 UTC (rev 209209)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2016-12-01 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r208825. rdar://problem/29277338
+
+ 2016-11-16 Brent Fulgham <bfulgham@apple.com>
+
+ Clear track client when removing a track
+ https://bugs.webkit.org/show_bug.cgi?id=164842
+ <rdar://problem/29213621>
+
+ Reviewed by Eric Carlson.
+
+ * media/track/audio-track-add-remove-expected.txt: Added.
+ * media/track/audio-track-add-remove.html: Added.
+ * media/track/video-track-add-remove-expected.txt: Added.
+ * media/track/video-track-add-remove.html: Added.
+
+2016-12-01 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r208628. rdar://problem/29277337
</span><span class="cx">
</span><span class="cx"> 2016-11-11 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsmediatrackaudiotrackaddremoveexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/media/track/audio-track-add-remove-expected.txt (0 => 209209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/media/track/audio-track-add-remove-expected.txt (rev 0)
+++ branches/safari-602-branch/LayoutTests/media/track/audio-track-add-remove-expected.txt 2016-12-01 22:23:54 UTC (rev 209209)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+
+Test audio track handling.
+
+EVENT(addtrack)
+PASS: Track is in valid state.
+END OF TEST
+
</ins></span></pre></div>
<a id="branchessafari602branchLayoutTestsmediatrackaudiotrackaddremovehtml"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/media/track/audio-track-add-remove.html (0 => 209209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/media/track/audio-track-add-remove.html (rev 0)
+++ branches/safari-602-branch/LayoutTests/media/track/audio-track-add-remove.html 2016-12-01 22:23:54 UTC (rev 209209)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <script src=../media-file.js></script>
+ <script src=../video-test.js></script>
+ <script src=../../resources/gc.js></script>
+ <script>
+ function trackAdded(event)
+ {
+ consoleWrite("EVENT(" + event.type + ")");
+ video.audioTracks.onaddtrack = null;
+ var track = event.track;
+ track.enabled = false;
+ video.src = "";
+ video = null;
+
+ setTimeout(function() {
+ gc();
+ track.enabled = !track.enabled;
+ consoleWrite("PASS: Track is in valid state.");
+ endTest();
+ }, 0);
+ }
+
+ function setup()
+ {
+ findMediaElement();
+ video.audioTracks.addEventListener("addtrack", trackAdded);
+ video.src = findMediaFile('audio', '../content/silence');
+ }
+ </script>
+</head>
+<body onload="setup()">
+ <video controls></video>
+ <p>Test audio track handling.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari602branchLayoutTestsmediatrackvideotrackaddremoveexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/media/track/video-track-add-remove-expected.txt (0 => 209209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/media/track/video-track-add-remove-expected.txt (rev 0)
+++ branches/safari-602-branch/LayoutTests/media/track/video-track-add-remove-expected.txt 2016-12-01 22:23:54 UTC (rev 209209)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+
+Test video track handling.
+
+EVENT(addtrack)
+PASS: Track is in valid state.
+END OF TEST
+
</ins></span></pre></div>
<a id="branchessafari602branchLayoutTestsmediatrackvideotrackaddremovehtml"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/media/track/video-track-add-remove.html (0 => 209209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/media/track/video-track-add-remove.html (rev 0)
+++ branches/safari-602-branch/LayoutTests/media/track/video-track-add-remove.html 2016-12-01 22:23:54 UTC (rev 209209)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <script src=../media-file.js></script>
+ <script src=../video-test.js></script>
+ <script src=../../resources/gc.js></script>
+ <script>
+ function trackAdded(event)
+ {
+ consoleWrite("EVENT(" + event.type + ")");
+ video.videoTracks.onaddtrack = null;
+ var track = event.track;
+ track.enabled = false;
+ video.src = "";
+ video = null;
+ setTimeout(function() {
+ gc();
+ track.enabled = !track.enabled;
+ consoleWrite("PASS: Track is in valid state.");
+ endTest();
+ }, 0);
+ }
+
+ function setup()
+ {
+ findMediaElement();
+ video.videoTracks.addEventListener("addtrack", trackAdded);
+ video.src = findMediaFile('video', '../content/test');
+ }
+ </script>
+</head>
+<body onload="setup()">
+ <video controls></video>
+ <p>Test video track handling.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (209208 => 209209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-12-01 22:23:50 UTC (rev 209208)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-12-01 22:23:54 UTC (rev 209209)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2016-12-01 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r208825. rdar://problem/29277338
+
+ 2016-11-16 Brent Fulgham <bfulgham@apple.com>
+
+ Clear track client when removing a track
+ https://bugs.webkit.org/show_bug.cgi?id=164842
+ <rdar://problem/29213621>
+
+ Reviewed by Eric Carlson.
+
+ Call 'clearClient' when removing a track from an HTMLMediaElement.
+
+ Test: media/track/audio-track-add-remove.html
+ media/track/video-track-add-remove.html
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::removeAudioTrack): Call 'clearClient'
+ (WebCore::HTMLMediaElement::removeVideoTrack): Ditto.
+
+2016-12-01 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r208629. rdar://problem/29277337
</span><span class="cx">
</span><span class="cx"> 2016-11-11 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/html/HTMLMediaElement.cpp (209208 => 209209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/html/HTMLMediaElement.cpp 2016-12-01 22:23:50 UTC (rev 209208)
+++ branches/safari-602-branch/Source/WebCore/html/HTMLMediaElement.cpp 2016-12-01 22:23:54 UTC (rev 209209)
</span><span class="lines">@@ -3789,6 +3789,7 @@
</span><span class="cx"> void HTMLMediaElement::removeAudioTrack(AudioTrack& track)
</span><span class="cx"> {
</span><span class="cx"> m_audioTracks->remove(track);
</span><ins>+ track.clearClient();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::removeTextTrack(TextTrack& track, bool scheduleEvent)
</span><span class="lines">@@ -3806,6 +3807,7 @@
</span><span class="cx"> void HTMLMediaElement::removeVideoTrack(VideoTrack& track)
</span><span class="cx"> {
</span><span class="cx"> m_videoTracks->remove(track);
</span><ins>+ track.clearClient();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::forgetResourceSpecificTracks()
</span></span></pre>
</div>
</div>
</body>
</html>