Changeset 251603 in webkit
- Timestamp:
- Oct 25, 2019 2:44:14 PM (4 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r251602 r251603 1 2019-10-25 youenn fablet <youenn@apple.com> 2 3 Introduce AudioTrackPrivateMediaStreamCocoa::clear() 4 https://bugs.webkit.org/show_bug.cgi?id=203369 5 <rdar://problem/49017262> 6 7 Reviewed by Jer Noble. 8 9 Introduce the clear method to make sure the AudioTrackPrivteMediaStreamCocoa is in a clean state. 10 This will help further simplifications. 11 12 * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm: 13 (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::~MediaPlayerPrivateMediaStreamAVFObjC): 14 (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::updateTracks): 15 * platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.cpp: 16 (WebCore::AudioTrackPrivateMediaStreamCocoa::~AudioTrackPrivateMediaStreamCocoa): 17 (WebCore::AudioTrackPrivateMediaStreamCocoa::clear): 18 * platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.h: 19 1 20 2019-10-25 Matt Lewis <jlewis3@apple.com> 2 21 -
trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm
r248846 r251603 211 211 destroyLayers(); 212 212 213 m_audioTrackMap.clear(); 213 auto audioTrackMap = WTFMove(m_audioTrackMap); 214 for (auto& track : audioTrackMap.values()) 215 track->clear(); 216 214 217 m_videoTrackMap.clear(); 215 218 } … … 1015 1018 case TrackState::Remove: 1016 1019 track.streamTrack().removeObserver(*this); 1020 track.clear(); 1017 1021 m_player->removeAudioTrack(track); 1018 1022 break; -
trunk/Source/WebCore/platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.cpp
r250290 r251603 48 48 AudioTrackPrivateMediaStreamCocoa::~AudioTrackPrivateMediaStreamCocoa() 49 49 { 50 clear(); 51 } 52 53 void AudioTrackPrivateMediaStreamCocoa::clear() 54 { 55 if (m_isCleared) 56 return; 57 58 m_isCleared = true; 50 59 streamTrack().source().removeObserver(*this); 51 60 -
trunk/Source/WebCore/platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.h
r250290 r251603 46 46 } 47 47 48 void clear(); 49 48 50 void play(); 49 51 void pause(); … … 91 93 bool m_autoPlay { false }; 92 94 bool m_muted { false }; 95 bool m_isCleared { false }; 93 96 }; 94 97
Note: See TracChangeset
for help on using the changeset viewer.