Changeset 149448 in webkit

Timestamp:

May 1, 2013 12:57:31 PM (11 years ago)

Author:

eric.carlson@apple.com

Message:

[Mac Lion] Assertion failure in MediaControlTextTrackContainerElement::updateDisplay()
​https://bugs.webkit.org/show_bug.cgi?id=115289

Reviewed by Jer Noble.

No new tests, this is a speculative fix for an infrequent assertion.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::textTrackRemoveCue): Mark the cue as inactive when it is removed

from the active set.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-01  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac Lion] Assertion failure in MediaControlTextTrackContainerElement::updateDisplay()
+        https://bugs.webkit.org/show_bug.cgi?id=115289
+
+        Reviewed by Jer Noble.
+
+        No new tests, this is a speculative fix for an infrequent assertion.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::textTrackRemoveCue): Mark the cue as inactive when it is removed
+            from the active set.
+
 2013-05-01  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -1472 +1472 @@
 
     size_t index = m_currentlyActiveCues.find(interval);
-    if (index != notFound)
+    if (index != notFound) {
+        cue->setIsActive(false);
         m_currentlyActiveCues.remove(index);
+    }
 
     cue->removeDisplayTree();