Changeset 151796 in webkit

Timestamp:

Jun 20, 2013 1:14:03 PM (11 years ago)

Author:

eric.carlson@apple.com

Message:

ASSERT removing then adding a <track> element
​https://bugs.webkit.org/show_bug.cgi?id=117814

Reviewed by Jer Noble.

Source/WebCore:

Test: media/track/add-and-remove-track.html

• html/HTMLTrackElement.cpp:

(WebCore::HTMLTrackElement::insertedInto): Always call ensureTrack before adding the track

to the parent <video> element.

(WebCore::HTMLTrackElement::ensureTrack): Call m_track->setTrackElement() in case the

parent was cleared after m_track was created.

• html/track/LoadableTextTrack.cpp:

(WebCore::LoadableTextTrack::setTrackElement): New, set m_trackElement.

• html/track/LoadableTextTrack.h:

LayoutTests:

• media/track/add-and-remove-track-expected.txt: Added.
• media/track/add-and-remove-track.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/track/add-and-remove-track-expected.txt (added)
• LayoutTests/media/track/add-and-remove-track.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLTrackElement.cpp (modified) (2 diffs)
• Source/WebCore/html/track/LoadableTextTrack.cpp (modified) (1 diff)
• Source/WebCore/html/track/LoadableTextTrack.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-06-20  Eric Carlson  <eric.carlson@apple.com>
+
+        ASSERT removing then adding a <track> element
+        https://bugs.webkit.org/show_bug.cgi?id=117814
+
+        Reviewed by Jer Noble.
+
+        * media/track/add-and-remove-track-expected.txt: Added.
+        * media/track/add-and-remove-track.html: Added.
+
 2013-06-20  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-06-20  Eric Carlson  <eric.carlson@apple.com>
+
+        ASSERT removing then adding a <track> element
+        https://bugs.webkit.org/show_bug.cgi?id=117814
+
+        Reviewed by Jer Noble.
+
+        Test: media/track/add-and-remove-track.html
+
+        * html/HTMLTrackElement.cpp:
+        (WebCore::HTMLTrackElement::insertedInto): Always call ensureTrack before adding the track
+            to the parent <video> element.
+        (WebCore::HTMLTrackElement::ensureTrack): Call m_track->setTrackElement() in case the
+            parent was cleared after m_track was created.
+
+        * html/track/LoadableTextTrack.cpp:
+        (WebCore::LoadableTextTrack::setTrackElement): New, set m_trackElement.
+        * html/track/LoadableTextTrack.h:
+
 2013-06-20  Roger Fong  <roger_fong@apple.com>
 

trunk/Source/WebCore/html/HTMLTrackElement.cpp

@@ -80 +80 @@
     HTMLElement::insertedInto(insertionPoint);
     HTMLMediaElement* parent = mediaElement();
-    if (insertionPoint == parent)
+    if (insertionPoint == parent) {
+        ensureTrack();
         parent->didAddTextTrack(this);
+    }
     return InsertionDone;
 }
@@ -174 +176 @@
             kind = TextTrack::subtitlesKeyword();
         m_track = LoadableTextTrack::create(this, kind, label(), srclang());
-    }
+    } else
+        m_track->setTrackElement(this);
+
     return m_track.get();
 }

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

@@ -76 +76 @@
 {
     return m_trackElement;
+}
+    
+void LoadableTextTrack::setTrackElement(HTMLTrackElement* element)
+{
+    ASSERT(!m_trackElement || m_trackElement == element);
+    m_trackElement = element;
 }
 

trunk/Source/WebCore/html/track/LoadableTextTrack.h

@@ -61 +61 @@
     size_t trackElementIndex();
     HTMLTrackElement* trackElement() { return m_trackElement; }
+    void setTrackElement(HTMLTrackElement*);
     virtual Element* element() OVERRIDE;