<!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>[204073] 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/204073">204073</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-08-02 23:16:15 -0700 (Tue, 02 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/204050">r204050</a>. rdar://problem/27313234</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>
<li><a href="#branchessafari602branchSourceWebCorehtmltrackAudioTrackcpp">branches/safari-602-branch/Source/WebCore/html/track/AudioTrack.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCorehtmltrackTextTrackListcpp">branches/safari-602-branch/Source/WebCore/html/track/TextTrackList.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCorehtmltrackTextTrackListh">branches/safari-602-branch/Source/WebCore/html/track/TextTrackList.h</a></li>
<li><a href="#branchessafari602branchSourceWebCorehtmltrackTrackListBasecpp">branches/safari-602-branch/Source/WebCore/html/track/TrackListBase.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCorehtmltrackTrackListBaseh">branches/safari-602-branch/Source/WebCore/html/track/TrackListBase.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsmediarangeextractcontentscrashexpectedtxt">branches/safari-602-branch/LayoutTests/media/range-extract-contents-crash-expected.txt</a></li>
<li><a href="#branchessafari602branchLayoutTestsmediarangeextractcontentscrashhtml">branches/safari-602-branch/LayoutTests/media/range-extract-contents-crash.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 (204072 => 204073)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/ChangeLog 2016-08-03 06:16:10 UTC (rev 204072)
+++ branches/safari-602-branch/LayoutTests/ChangeLog 2016-08-03 06:16:15 UTC (rev 204073)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2016-08-02 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r204050. rdar://problem/27313234
+
+ 2016-08-02 Eric Carlson <eric.carlson@apple.com>
+
+ Cleanup HTMLMediaElement track lists.
+ https://bugs.webkit.org/show_bug.cgi?id=160470
+
+ Reviewed by David Kilzer.
+
+ * media/range-extract-contents-crash-expected.txt: Added.
+ * media/range-extract-contents-crash.html: Added.
+
+2016-08-02 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r204062. rdar://problem/27592936
</span><span class="cx">
</span><span class="cx"> 2016-08-02 Nan Wang <n_wang@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsmediarangeextractcontentscrashexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/media/range-extract-contents-crash-expected.txt (0 => 204073)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/media/range-extract-contents-crash-expected.txt (rev 0)
+++ branches/safari-602-branch/LayoutTests/media/range-extract-contents-crash-expected.txt 2016-08-03 06:16:15 UTC (rev 204073)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+
+Tests that moving a video element from the document tree into a DocumentFragment does not crash.
+
+If this test does not crash, it passes.
</ins></span></pre></div>
<a id="branchessafari602branchLayoutTestsmediarangeextractcontentscrashhtml"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/media/range-extract-contents-crash.html (0 => 204073)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/media/range-extract-contents-crash.html (rev 0)
+++ branches/safari-602-branch/LayoutTests/media/range-extract-contents-crash.html 2016-08-03 06:16:15 UTC (rev 204073)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+<!DOCTYPE HTML>
+<html>
+<head>
+<script src="../resources/gc.js"></script>
+<script>
+ if (window.testRunner) {
+ window.testRunner.dumpAsText();
+ window.testRunner.waitUntilDone();
+ }
+
+ let tracks = [];
+
+ function runTest()
+ {
+ div = document.getElementsByTagName('div')[0];
+
+ audio = document.createElement("audio");
+ div.appendChild(audio);
+
+ video = document.createElement("video");
+ div.appendChild(video);
+
+ for (let i = 0; i < 10; i++) {
+ let track = document.createElement("track");
+ track.src = 'data:text/vtt,'+encodeURIComponent('WEBVTT\n\n00:00:00.000 --> 00:00:01.000\ntest\n');
+ track.kind = "caption";
+ track.srclang = "fr";
+ video.appendChild(track);
+ tracks.push(track);
+ }
+
+ object = document.createElement("object");
+ video.appendChild(object);
+
+ range = document.createRange();
+ range.selectNodeContents(audio);
+ range.setEndBefore(object);
+ setTimeout(step1, 0);
+ gc();
+ }
+
+ function step1()
+ {
+ range.extractContents();
+ gc();
+ setTimeout(step2, 0);
+ }
+
+ function step2()
+ {
+ for (let i = 0; i < 10; i++)
+ tracks[i].srclang = "en";
+
+ if (window.testRunner)
+ window.testRunner.notifyDone();
+ }
+</script>
+</head>
+<body onload="runTest()">
+ <div></div>
+ <p>Tests that moving a video element from the document tree into a DocumentFragment does not crash.</p>
+ <p>If this test does not crash, it passes.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (204072 => 204073)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-08-03 06:16:10 UTC (rev 204072)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-08-03 06:16:15 UTC (rev 204073)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2016-08-02 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r204050. rdar://problem/27313234
+
+ 2016-08-02 Eric Carlson <eric.carlson@apple.com>
+
+ Cleanup HTMLMediaElement track lists.
+ https://bugs.webkit.org/show_bug.cgi?id=160470
+
+ Reviewed by David Kilzer.
+
+ Test: media/range-extract-contents-crash.html
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::~HTMLMediaElement):
+
+ * html/track/AudioTrack.cpp:
+ (WebCore::AudioTrack::willRemove): ASSERT if media element is NULL.
+
+ * html/track/TextTrackList.cpp:
+ (TextTrackList::clearElement): Clear track media element pointers and client.
+ * html/track/TextTrackList.h:
+
+ * html/track/TrackListBase.cpp:
+ (TrackListBase::~TrackListBase): Call clearElement.
+ (TrackListBase::clearElement): Clear track media element pointers and client.
+ * html/track/TrackListBase.h:
+
+2016-08-02 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r204062. rdar://problem/27592936
</span><span class="cx">
</span><span class="cx"> 2016-08-02 Nan Wang <n_wang@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/html/HTMLMediaElement.cpp (204072 => 204073)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/html/HTMLMediaElement.cpp 2016-08-03 06:16:10 UTC (rev 204072)
+++ branches/safari-602-branch/Source/WebCore/html/HTMLMediaElement.cpp 2016-08-03 06:16:15 UTC (rev 204073)
</span><span class="lines">@@ -509,22 +509,12 @@
</span><span class="cx"> unregisterWithDocument(document());
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>- if (m_audioTracks) {
</del><ins>+ if (m_audioTracks)
</ins><span class="cx"> m_audioTracks->clearElement();
</span><del>- for (unsigned i = 0; i < m_audioTracks->length(); ++i)
- m_audioTracks->item(i)->clearClient();
- }
</del><span class="cx"> if (m_textTracks)
</span><span class="cx"> m_textTracks->clearElement();
</span><del>- if (m_textTracks) {
- for (unsigned i = 0; i < m_textTracks->length(); ++i)
- m_textTracks->item(i)->clearClient();
- }
- if (m_videoTracks) {
</del><ins>+ if (m_videoTracks)
</ins><span class="cx"> m_videoTracks->clearElement();
</span><del>- for (unsigned i = 0; i < m_videoTracks->length(); ++i)
- m_videoTracks->item(i)->clearClient();
- }
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorehtmltrackAudioTrackcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/html/track/AudioTrack.cpp (204072 => 204073)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/html/track/AudioTrack.cpp 2016-08-03 06:16:10 UTC (rev 204072)
+++ branches/safari-602-branch/Source/WebCore/html/track/AudioTrack.cpp 2016-08-03 06:16:15 UTC (rev 204073)
</span><span class="lines">@@ -167,7 +167,9 @@
</span><span class="cx"> void AudioTrack::willRemove(TrackPrivateBase* trackPrivate)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(trackPrivate, trackPrivate == m_private);
</span><del>- mediaElement()->removeAudioTrack(*this);
</del><ins>+ ASSERT(mediaElement());
+ if (mediaElement())
+ mediaElement()->removeAudioTrack(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AudioTrack::updateKindFromPrivate()
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorehtmltrackTextTrackListcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/html/track/TextTrackList.cpp (204072 => 204073)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/html/track/TextTrackList.cpp 2016-08-03 06:16:10 UTC (rev 204072)
+++ branches/safari-602-branch/Source/WebCore/html/track/TextTrackList.cpp 2016-08-03 06:16:15 UTC (rev 204073)
</span><span class="lines">@@ -46,6 +46,19 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void TextTrackList::clearElement()
+{
+ TrackListBase::clearElement();
+ for (auto& track : m_elementTracks) {
+ track->setMediaElement(nullptr);
+ track->clearClient();
+ }
+ for (auto& track : m_addTrackTracks) {
+ track->setMediaElement(nullptr);
+ track->clearClient();
+ }
+}
+
</ins><span class="cx"> unsigned TextTrackList::length() const
</span><span class="cx"> {
</span><span class="cx"> return m_addTrackTracks.size() + m_elementTracks.size() + m_inbandTracks.size();
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorehtmltrackTextTrackListh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/html/track/TextTrackList.h (204072 => 204073)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/html/track/TextTrackList.h 2016-08-03 06:16:10 UTC (rev 204072)
+++ branches/safari-602-branch/Source/WebCore/html/track/TextTrackList.h 2016-08-03 06:16:15 UTC (rev 204073)
</span><span class="lines">@@ -42,6 +42,8 @@
</span><span class="cx"> }
</span><span class="cx"> virtual ~TextTrackList();
</span><span class="cx">
</span><ins>+ void clearElement() override;
+
</ins><span class="cx"> unsigned length() const override;
</span><span class="cx"> int getTrackIndex(TextTrack&);
</span><span class="cx"> int getTrackIndexRelativeToRenderedTracks(TextTrack&);
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorehtmltrackTrackListBasecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/html/track/TrackListBase.cpp (204072 => 204073)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/html/track/TrackListBase.cpp 2016-08-03 06:16:10 UTC (rev 204072)
+++ branches/safari-602-branch/Source/WebCore/html/track/TrackListBase.cpp 2016-08-03 06:16:15 UTC (rev 204073)
</span><span class="lines">@@ -46,8 +46,18 @@
</span><span class="cx">
</span><span class="cx"> TrackListBase::~TrackListBase()
</span><span class="cx"> {
</span><ins>+ clearElement();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void TrackListBase::clearElement()
+{
+ m_element = nullptr;
+ for (auto& track : m_inbandTracks) {
+ track->setMediaElement(nullptr);
+ track->clearClient();
+ }
+}
+
</ins><span class="cx"> Element* TrackListBase::element() const
</span><span class="cx"> {
</span><span class="cx"> return m_element;
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorehtmltrackTrackListBaseh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/html/track/TrackListBase.h (204072 => 204073)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/html/track/TrackListBase.h 2016-08-03 06:16:10 UTC (rev 204072)
+++ branches/safari-602-branch/Source/WebCore/html/track/TrackListBase.h 2016-08-03 06:16:15 UTC (rev 204073)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> using RefCounted<TrackListBase>::deref;
</span><span class="cx"> ScriptExecutionContext* scriptExecutionContext() const final { return m_context; }
</span><span class="cx">
</span><del>- void clearElement() { m_element = 0; }
</del><ins>+ virtual void clearElement();
</ins><span class="cx"> Element* element() const;
</span><span class="cx"> HTMLMediaElement* mediaElement() const { return m_element; }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>