Title: [149448] trunk/Source/WebCore
- Revision
- 149448
- Author
- [email protected]
- Date
- 2013-05-01 12:57:31 -0700 (Wed, 01 May 2013)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (149447 => 149448)
--- trunk/Source/WebCore/ChangeLog 2013-05-01 19:55:31 UTC (rev 149447)
+++ trunk/Source/WebCore/ChangeLog 2013-05-01 19:57:31 UTC (rev 149448)
@@ -1,3 +1,16 @@
+2013-05-01 Eric Carlson <[email protected]>
+
+ [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 <[email protected]>
TextTrackMenu crashes in ports where MediaElement players are lazily created
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (149447 => 149448)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-05-01 19:55:31 UTC (rev 149447)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-05-01 19:57:31 UTC (rev 149448)
@@ -1471,8 +1471,10 @@
m_cueTree.remove(interval);
size_t index = m_currentlyActiveCues.find(interval);
- if (index != notFound)
+ if (index != notFound) {
+ cue->setIsActive(false);
m_currentlyActiveCues.remove(index);
+ }
cue->removeDisplayTree();
updateActiveTextTrackCues(currentTime());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
