Title: [152459] trunk/Source/WebCore
- Revision
- 152459
- Author
- [email protected]
- Date
- 2013-07-08 11:33:32 -0700 (Mon, 08 Jul 2013)
Log Message
Fix TextTrackCue::cueIndex() to handle the null case of TextTrack::cues(() properly
https://bugs.webkit.org/show_bug.cgi?id=117815
<rdar://problem/14211041>
Patch by Ruth Fong <[email protected]> on 2013-07-08
Reviewed by Eric Carlson.
Merge https://src.chromium.org/viewvc/blink?revision=153206&view=revision
No new tests, only behavior change is preventing a crash in the release build.
cueIndex() is only used for sorting cues, so returning an invalidCueIndex in the case
where track()->cues() is null makes sense and won't modify behavior.
* html/track/TextTrackCue.cpp:
(WebCore::TextTrackCue::cueIndex):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (152458 => 152459)
--- trunk/Source/WebCore/ChangeLog 2013-07-08 18:16:41 UTC (rev 152458)
+++ trunk/Source/WebCore/ChangeLog 2013-07-08 18:33:32 UTC (rev 152459)
@@ -1,3 +1,20 @@
+2013-07-08 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 Eric Carlson.
+
+ Merge https://src.chromium.org/viewvc/blink?revision=153206&view=revision
+
+ No new tests, only behavior change is preventing a crash in the release build.
+ cueIndex() is only used for sorting cues, so returning an invalidCueIndex in the case
+ where track()->cues() is null makes sense and won't modify behavior.
+
+ * html/track/TextTrackCue.cpp:
+ (WebCore::TextTrackCue::cueIndex):
+
2013-07-08 Commit Queue <[email protected]>
Unreviewed, rolling out r152416.
Modified: trunk/Source/WebCore/html/track/TextTrackCue.cpp (152458 => 152459)
--- trunk/Source/WebCore/html/track/TextTrackCue.cpp 2013-07-08 18:16:41 UTC (rev 152458)
+++ trunk/Source/WebCore/html/track/TextTrackCue.cpp 2013-07-08 18:33:32 UTC (rev 152459)
@@ -486,7 +486,8 @@
if (m_cueIndex == invalidCueIndex) {
ASSERT(track());
ASSERT(track()->cues());
- m_cueIndex = track()->cues()->getCueIndex(this);
+ if (TextTrackCueList* cueList = track()->cues())
+ m_cueIndex = cueList->getCueIndex(this);
}
return m_cueIndex;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
