Title: [152656] branches/safari-537-branch/Source/WebCore
- Revision
- 152656
- Author
- [email protected]
- Date
- 2013-07-15 15:15:50 -0700 (Mon, 15 Jul 2013)
Log Message
Merged r151845. <rdar://problem/14211041>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (152655 => 152656)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-15 20:46:36 UTC (rev 152655)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-15 22:15:50 UTC (rev 152656)
@@ -1,3 +1,21 @@
+2013-07-15 Lucas Forschler <[email protected]>
+
+ Merge r151845
+
+ 2013-06-21 Ruth Fong <[email protected]>
+
+ Fix TextTrackCue::cueIndex() to handle the null case of TextTrack::cues(() properly
+ https://bugs.webkit.org/show_bug.cgi?id=117815
+ <rdar://problem/14211041>
+
+ Reviewed by Ryosuke Niwa.
+
+ This patch adds assert statements to try to catch when
+ track()->cues() returns a null pointer.
+
+ * html/track/TextTrackCue.cpp:
+ (WebCore::TextTrackCue::cueIndex):
+
2013-07-12 Lucas Forschler <[email protected]>
Merge r152571
Modified: branches/safari-537-branch/Source/WebCore/html/track/TextTrackCue.cpp (152655 => 152656)
--- branches/safari-537-branch/Source/WebCore/html/track/TextTrackCue.cpp 2013-07-15 20:46:36 UTC (rev 152655)
+++ branches/safari-537-branch/Source/WebCore/html/track/TextTrackCue.cpp 2013-07-15 22:15:50 UTC (rev 152656)
@@ -483,8 +483,11 @@
int TextTrackCue::cueIndex()
{
- if (m_cueIndex == invalidCueIndex)
+ if (m_cueIndex == invalidCueIndex) {
+ ASSERT(track());
+ ASSERT(track()->cues());
m_cueIndex = track()->cues()->getCueIndex(this);
+ }
return m_cueIndex;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes