Title: [143021] trunk
- Revision
- 143021
- Author
- [email protected]
- Date
- 2013-02-15 11:15:33 -0800 (Fri, 15 Feb 2013)
Log Message
Crash occurs at WebCore::TextTrackList::length() when enabling closed captions in movie
https://bugs.webkit.org/show_bug.cgi?id=109886
Reviewed by Dean Jackson.
Source/WebCore:
No new tests, media/media-captions.html does not crash with this change.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::markCaptionAndSubtitleTracksAsUnconfigured): Early return when
m_textTracks is NULL.
LayoutTests:
* platform/mac/TestExpectations: Remove media/media-captions.html.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (143020 => 143021)
--- trunk/LayoutTests/ChangeLog 2013-02-15 19:11:38 UTC (rev 143020)
+++ trunk/LayoutTests/ChangeLog 2013-02-15 19:15:33 UTC (rev 143021)
@@ -1,3 +1,12 @@
+2013-02-15 Eric Carlson <[email protected]>
+
+ Crash occurs at WebCore::TextTrackList::length() when enabling closed captions in movie
+ https://bugs.webkit.org/show_bug.cgi?id=109886
+
+ Reviewed by Dean Jackson.
+
+ * platform/mac/TestExpectations: Remove media/media-captions.html.
+
2013-02-15 Alexis Menard <[email protected]>
WebKit shouldn't accept "none, none" in transition shorthand property.
Modified: trunk/LayoutTests/platform/mac/TestExpectations (143020 => 143021)
--- trunk/LayoutTests/platform/mac/TestExpectations 2013-02-15 19:11:38 UTC (rev 143020)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2013-02-15 19:15:33 UTC (rev 143021)
@@ -1416,7 +1416,5 @@
# Crashing after https://webkit.org/b/105667
webkit.org/b/109232 [ Debug ] inspector/debugger/debugger-reload-on-pause.html [ Crash ]
-webkit.org/b/109869 media/media-captions.html [ Crash ]
-
# New test failing, needs investigation.
webkit.org/b/109179 compositing/transitions/transform-on-large-layer.html [ Failure ]
Modified: trunk/Source/WebCore/ChangeLog (143020 => 143021)
--- trunk/Source/WebCore/ChangeLog 2013-02-15 19:11:38 UTC (rev 143020)
+++ trunk/Source/WebCore/ChangeLog 2013-02-15 19:15:33 UTC (rev 143021)
@@ -1,3 +1,16 @@
+2013-02-15 Eric Carlson <[email protected]>
+
+ Crash occurs at WebCore::TextTrackList::length() when enabling closed captions in movie
+ https://bugs.webkit.org/show_bug.cgi?id=109886
+
+ Reviewed by Dean Jackson.
+
+ No new tests, media/media-captions.html does not crash with this change.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::markCaptionAndSubtitleTracksAsUnconfigured): Early return when
+ m_textTracks is NULL.
+
2013-02-15 Adam Barth <[email protected]>
TokenPreloadScanner should be able to scan CompactHTMLTokens
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (143020 => 143021)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-02-15 19:11:38 UTC (rev 143020)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2013-02-15 19:15:33 UTC (rev 143021)
@@ -4447,6 +4447,9 @@
void HTMLMediaElement::markCaptionAndSubtitleTracksAsUnconfigured()
{
+ if (!m_textTracks)
+ return;
+
// Mark all tracks as not "configured" so that configureTextTracks()
// will reconsider which tracks to display in light of new user preferences
// (e.g. default tracks should not be displayed if the user has turned off
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
