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

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

Issue 941983003: Hoist cue "deactivation" out of TextTrackCueList::remove (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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
« no previous file with comments | « no previous file | Source/core/html/track/TextTrackCueList.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * Copyright (C) 2011, 2012, 2013 Apple Inc. All rights reserved. 3 * Copyright (C) 2011, 2012, 2013 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 exceptionState.throwDOMException(NotFoundError, "The specified cue is no t listed in the TextTrack's list of cues."); 267 exceptionState.throwDOMException(NotFoundError, "The specified cue is no t listed in the TextTrack's list of cues.");
268 return; 268 return;
269 } 269 }
270 270
271 // 2. Remove cue from the method's TextTrack object's text track's text trac k list of cues. 271 // 2. Remove cue from the method's TextTrack object's text track's text trac k list of cues.
272 if (!m_cues || !m_cues->remove(cue)) { 272 if (!m_cues || !m_cues->remove(cue)) {
273 exceptionState.throwDOMException(InvalidStateError, "Failed to remove th e specified cue."); 273 exceptionState.throwDOMException(InvalidStateError, "Failed to remove th e specified cue.");
274 return; 274 return;
275 } 275 }
276 276
277 cue->setIsActive(false);
278 cue->removeDisplayTree();
279
277 cue->setTrack(0); 280 cue->setTrack(0);
278 if (cueTimeline()) 281 if (cueTimeline())
279 cueTimeline()->removeCue(this, cue); 282 cueTimeline()->removeCue(this, cue);
280 } 283 }
281 284
282 VTTRegionList* TextTrack::ensureVTTRegionList() 285 VTTRegionList* TextTrack::ensureVTTRegionList()
283 { 286 {
284 if (!m_regions) 287 if (!m_regions)
285 m_regions = VTTRegionList::create(); 288 m_regions = VTTRegionList::create();
286 289
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 DEFINE_TRACE(TextTrack) 452 DEFINE_TRACE(TextTrack)
450 { 453 {
451 visitor->trace(m_cues); 454 visitor->trace(m_cues);
452 visitor->trace(m_regions); 455 visitor->trace(m_regions);
453 visitor->trace(m_trackList); 456 visitor->trace(m_trackList);
454 TrackBase::trace(visitor); 457 TrackBase::trace(visitor);
455 EventTargetWithInlineData::trace(visitor); 458 EventTargetWithInlineData::trace(visitor);
456 } 459 }
457 460
458 } // namespace blink 461 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/html/track/TextTrackCueList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698