Title: [201385] trunk/Source/WebCore
- Revision
- 201385
- Author
- [email protected]
- Date
- 2016-05-25 09:19:52 -0700 (Wed, 25 May 2016)
Log Message
ASSERT in WebCore::TextTrackList::remove when running media/track/track-remove-track.html
https://bugs.webkit.org/show_bug.cgi?id=158071
<rdar://problem/26432041>
Reviewed by Chris Dumez.
No new tests, this prevents media/track/track-remove-track.html from crashing.
* html/track/TextTrackList.cpp:
(TextTrackList::remove): Don't assert when the media element has been set to null.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (201384 => 201385)
--- trunk/Source/WebCore/ChangeLog 2016-05-25 16:01:12 UTC (rev 201384)
+++ trunk/Source/WebCore/ChangeLog 2016-05-25 16:19:52 UTC (rev 201385)
@@ -1,3 +1,16 @@
+2016-05-25 Eric Carlson <[email protected]>
+
+ ASSERT in WebCore::TextTrackList::remove when running media/track/track-remove-track.html
+ https://bugs.webkit.org/show_bug.cgi?id=158071
+ <rdar://problem/26432041>
+
+ Reviewed by Chris Dumez.
+
+ No new tests, this prevents media/track/track-remove-track.html from crashing.
+
+ * html/track/TextTrackList.cpp:
+ (TextTrackList::remove): Don't assert when the media element has been set to null.
+
2016-05-25 Zalan Bujtas <[email protected]>
Addressing post-review comments on r200971.
Modified: trunk/Source/WebCore/html/track/TextTrackList.cpp (201384 => 201385)
--- trunk/Source/WebCore/html/track/TextTrackList.cpp 2016-05-25 16:01:12 UTC (rev 201384)
+++ trunk/Source/WebCore/html/track/TextTrackList.cpp 2016-05-25 16:19:52 UTC (rev 201385)
@@ -217,7 +217,7 @@
invalidateTrackIndexesAfterTrack(textTrack);
- ASSERT(!track.mediaElement() || track.mediaElement() == element());
+ ASSERT(!track.mediaElement() || !element() || track.mediaElement() == element());
track.setMediaElement(nullptr);
Ref<TrackBase> trackRef = *(*tracks)[index];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
