Title: [204094] branches/safari-602-branch/Source/WebCore
- Revision
- 204094
- Author
- [email protected]
- Date
- 2016-08-03 12:10:20 -0700 (Wed, 03 Aug 2016)
Log Message
Merge r204089. rdar://problem/27313234
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (204093 => 204094)
--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-08-03 18:50:57 UTC (rev 204093)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-08-03 19:10:20 UTC (rev 204094)
@@ -1,5 +1,23 @@
2016-08-03 Babak Shafiei <[email protected]>
+ Merge r204089. rdar://problem/27313234
+
+ 2016-08-03 Eric Carlson <[email protected]>
+
+ Cleanup HTMLMediaElement track lists.
+ https://bugs.webkit.org/show_bug.cgi?id=160470
+
+ Reviewed by Brent Fulgham.
+
+ * html/track/AudioTrack.cpp:
+ (WebCore::AudioTrack::willRemove): Remove unnecessary ASSERT and NULL check.
+
+ * html/track/TextTrackList.cpp:
+ (TextTrackList::~TextTrackList): Call clearElement so media element and client pointers are
+ cleared.
+
+2016-08-03 Babak Shafiei <[email protected]>
+
Merge r204082. rdar://problem/27547583
2016-08-03 Eric Carlson <[email protected]>
Modified: branches/safari-602-branch/Source/WebCore/html/track/AudioTrack.cpp (204093 => 204094)
--- branches/safari-602-branch/Source/WebCore/html/track/AudioTrack.cpp 2016-08-03 18:50:57 UTC (rev 204093)
+++ branches/safari-602-branch/Source/WebCore/html/track/AudioTrack.cpp 2016-08-03 19:10:20 UTC (rev 204094)
@@ -167,9 +167,7 @@
void AudioTrack::willRemove(TrackPrivateBase* trackPrivate)
{
ASSERT_UNUSED(trackPrivate, trackPrivate == m_private);
- ASSERT(mediaElement());
- if (mediaElement())
- mediaElement()->removeAudioTrack(*this);
+ mediaElement()->removeAudioTrack(*this);
}
void AudioTrack::updateKindFromPrivate()
Modified: branches/safari-602-branch/Source/WebCore/html/track/TextTrackList.cpp (204093 => 204094)
--- branches/safari-602-branch/Source/WebCore/html/track/TextTrackList.cpp 2016-08-03 18:50:57 UTC (rev 204093)
+++ branches/safari-602-branch/Source/WebCore/html/track/TextTrackList.cpp 2016-08-03 19:10:20 UTC (rev 204094)
@@ -44,6 +44,7 @@
TextTrackList::~TextTrackList()
{
+ clearElement();
}
void TextTrackList::clearElement()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
