Bug 1310162 - mTrack in SimpleTextTrackEvent might be null. r=jwwang
MozReview-Commit-ID: ESqYqBem7kQ
--- a/dom/html/TextTrackManager.cpp
+++ b/dom/html/TextTrackManager.cpp
@@ -486,21 +486,23 @@ private:
TextTrack* mTrack;
RefPtr<TextTrackCue> mCue;
};
class CompareSimpleTextTrackEvents {
private:
int32_t TrackChildPosition(SimpleTextTrackEvent* aEvent) const
{
- HTMLTrackElement* trackElement = aEvent->mTrack->GetTrackElement();;
- if (!trackElement) {
- return -1;
+ if (aEvent->mTrack) {
+ HTMLTrackElement* trackElement = aEvent->mTrack->GetTrackElement();
+ if (trackElement) {
+ return mMediaElement->IndexOf(trackElement);
+ }
}
- return mMediaElement->IndexOf(trackElement);
+ return -1;
}
HTMLMediaElement* mMediaElement;
public:
explicit CompareSimpleTextTrackEvents(HTMLMediaElement* aMediaElement)
{
mMediaElement = aMediaElement;
}