Changeset 201385 in webkit

Timestamp:

May 25, 2016, 9:19:52 AM (10 years ago)

Author:

eric.carlson@apple.com

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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/track/TextTrackList.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-05-25  Eric Carlson  <eric.carlson@apple.com>
+
+        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  <zalan@apple.com>
 

trunk/Source/WebCore/html/track/TextTrackList.cpp

@@ -218 +218 @@
     invalidateTrackIndexesAfterTrack(textTrack);
 
-    ASSERT(!track.mediaElement() || track.mediaElement() == element());
+    ASSERT(!track.mediaElement() || !element() || track.mediaElement() == element());
     track.setMediaElement(nullptr);