Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(47)

Side by Side Diff: Source/core/html/track/InbandTextTrack.cpp

Issue 177243018: Prevent 'removetrack' events from firing when all inband text tracks are removed. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Move the inband track removal loop into TextTrackList. Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 // Make sure m_webTrack was cleared by trackRemoved() before destruction. 77 // Make sure m_webTrack was cleared by trackRemoved() before destruction.
78 ASSERT(!m_webTrack); 78 ASSERT(!m_webTrack);
79 } 79 }
80 80
81 size_t InbandTextTrack::inbandTrackIndex() 81 size_t InbandTextTrack::inbandTrackIndex()
82 { 82 {
83 ASSERT(m_webTrack); 83 ASSERT(m_webTrack);
84 return m_webTrack->textTrackIndex(); 84 return m_webTrack->textTrackIndex();
85 } 85 }
86 86
87 void InbandTextTrack::trackRemoved() 87 void InbandTextTrack::setTrackList(TextTrackList* trackList)
88 { 88 {
89 TextTrack::setTrackList(trackList);
90 if (trackList)
91 return;
92
89 ASSERT(m_webTrack); 93 ASSERT(m_webTrack);
90 m_webTrack->setClient(0); 94 m_webTrack->setClient(0);
91 m_webTrack = 0; 95 m_webTrack = 0;
92 clearClient(); 96 clearClient();
93 } 97 }
94 98
95 void InbandTextTrack::addWebVTTCue(double start, double end, const WebString& id , const WebString& content, const WebString& settings) 99 void InbandTextTrack::addWebVTTCue(double start, double end, const WebString& id , const WebString& content, const WebString& settings)
96 { 100 {
97 RefPtr<VTTCue> cue = VTTCue::create(document(), start, end, content); 101 RefPtr<VTTCue> cue = VTTCue::create(document(), start, end, content);
98 cue->setId(id); 102 cue->setId(id);
99 cue->parseSettings(settings); 103 cue->parseSettings(settings);
100 addCue(cue); 104 addCue(cue);
101 } 105 }
102 106
103 } // namespace WebCore 107 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698