mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #10223 from ajmacd/shutdown-desktop-capturers

Browse source 
Ensure DesktopCapturers are destroyed when no longer needed.
This commit is contained in:
Cheng Zhao 2017-08-10 21:28:31 +09:00 committed by GitHub
commit c6289ef219
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
chromium_src/chrome/browser/media/desktop_media_list_observer.h
View file

@ -14,6 +14,9 @@ class DesktopMediaListObserver {
virtual void OnSourceMoved(int old_index, int new_index) = 0;
virtual void OnSourceNameChanged(int index) = 0;
virtual void OnSourceThumbnailChanged(int index) = 0;
// Return false to stop refreshing. The associated |DesktopMediaList| should
// no longer be used.
virtual bool OnRefreshFinished() = 0;
protected:

3
chromium_src/chrome/browser/media/native_desktop_media_list.cc
View file

@ -368,5 +368,8 @@ void NativeDesktopMediaList::OnRefreshFinished() {
base::Bind(&NativeDesktopMediaList::Refresh,
weak_factory_.GetWeakPtr()),
update_period_);
} else {
// Destroy the capturers.
worker_.reset();
}
}