| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights
reserved. | 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 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 2335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2346 | 2346 |
| 2347 void HTMLMediaElement::addTextTrack(TextTrack* track) | 2347 void HTMLMediaElement::addTextTrack(TextTrack* track) |
| 2348 { | 2348 { |
| 2349 textTracks()->append(track); | 2349 textTracks()->append(track); |
| 2350 | 2350 |
| 2351 textTracksChanged(); | 2351 textTracksChanged(); |
| 2352 } | 2352 } |
| 2353 | 2353 |
| 2354 void HTMLMediaElement::removeTextTrack(TextTrack* track) | 2354 void HTMLMediaElement::removeTextTrack(TextTrack* track) |
| 2355 { | 2355 { |
| 2356 TrackDisplayUpdateScope scope(this->cueTimeline()); | |
| 2357 m_textTracks->remove(track); | 2356 m_textTracks->remove(track); |
| 2358 | 2357 |
| 2359 textTracksChanged(); | 2358 textTracksChanged(); |
| 2360 } | 2359 } |
| 2361 | 2360 |
| 2362 void HTMLMediaElement::forgetResourceSpecificTracks() | 2361 void HTMLMediaElement::forgetResourceSpecificTracks() |
| 2363 { | 2362 { |
| 2364 // Implements the "forget the media element's media-resource-specific tracks
" algorithm. | 2363 // Implements the "forget the media element's media-resource-specific tracks
" algorithm. |
| 2365 // The order is explicitly specified as text, then audio, and finally video.
Also | 2364 // The order is explicitly specified as text, then audio, and finally video.
Also |
| 2366 // 'removetrack' events should not be fired. | 2365 // 'removetrack' events should not be fired. |
| (...skipping 1234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3601 | 3600 |
| 3602 #if ENABLE(WEB_AUDIO) | 3601 #if ENABLE(WEB_AUDIO) |
| 3603 void HTMLMediaElement::clearWeakMembers(Visitor* visitor) | 3602 void HTMLMediaElement::clearWeakMembers(Visitor* visitor) |
| 3604 { | 3603 { |
| 3605 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider()) | 3604 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider()) |
| 3606 audioSourceProvider()->setClient(nullptr); | 3605 audioSourceProvider()->setClient(nullptr); |
| 3607 } | 3606 } |
| 3608 #endif | 3607 #endif |
| 3609 | 3608 |
| 3610 } | 3609 } |
| OLD | NEW |