Title: [204089] trunk/Source/WebCore
Revision
204089
Author
eric.carl...@apple.com
Date
2016-08-03 11:17:38 -0700 (Wed, 03 Aug 2016)

Log Message

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.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (204088 => 204089)


--- trunk/Source/WebCore/ChangeLog	2016-08-03 18:11:50 UTC (rev 204088)
+++ trunk/Source/WebCore/ChangeLog	2016-08-03 18:17:38 UTC (rev 204089)
@@ -1,3 +1,17 @@
+2016-08-03  Eric Carlson  <eric.carl...@apple.com>
+
+        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-02  Ada Chan  <adac...@apple.com>
 
         [Mac] media/pip-video-going-into-fullscreen.html is a flaky failure

Modified: trunk/Source/WebCore/html/track/AudioTrack.cpp (204088 => 204089)


--- trunk/Source/WebCore/html/track/AudioTrack.cpp	2016-08-03 18:11:50 UTC (rev 204088)
+++ trunk/Source/WebCore/html/track/AudioTrack.cpp	2016-08-03 18:17:38 UTC (rev 204089)
@@ -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: trunk/Source/WebCore/html/track/TextTrackList.cpp (204088 => 204089)


--- trunk/Source/WebCore/html/track/TextTrackList.cpp	2016-08-03 18:11:50 UTC (rev 204088)
+++ trunk/Source/WebCore/html/track/TextTrackList.cpp	2016-08-03 18:17:38 UTC (rev 204089)
@@ -44,6 +44,7 @@
 
 TextTrackList::~TextTrackList()
 {
+    clearElement();
 }
 
 void TextTrackList::clearElement()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to