Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-26 20:30:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1597451 - Remove unnecessary IterateWindowListeners. r=jib

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D93078
This commit is contained in:
Andreas Pehrson 2020-10-19 09:52:50 +00:00
parent 0d17709deb
commit 86ef11ab0d
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dom/media/MediaManager.cpp
View File

@ -3455,19 +3455,10 @@ void MediaManager::OnNavigation(uint64_t aWindowID) {
// be added to from the main-thread
auto* window = nsGlobalWindowInner::GetInnerWindowWithId(aWindowID);
if (window) {
// We have cleanup to do when we're the current window. OnNavigation is also
// called by nsGlobalWindowInner::FreeInnerObjects, which MAY happen later
// when window is not current. In that case, cleanup has already happened.
if (!window->IsCurrentInnerWindow()) {
return;
if (RefPtr<GetUserMediaWindowListener> listener =
GetWindowListener(aWindowID)) {
listener->RemoveAll();
}
IterateWindowListeners(
window, [self = RefPtr<MediaManager>(this),
windowID = DebugOnly<decltype(aWindowID)>(aWindowID)](
const RefPtr<GetUserMediaWindowListener>& aListener) {
aListener->RemoveAll();
MOZ_ASSERT(!self->GetWindowListener(windowID));
});
} else {
RemoveWindowID(aWindowID);
}
@ -4060,17 +4051,12 @@ MediaManager::SanitizeDeviceIds(int64_t aSinceWhen) {
}
void MediaManager::StopScreensharing(uint64_t aWindowID) {
// We need to stop window/screensharing for all streams in this innerwindow
// and all its sub frames.
// We need to stop window/screensharing for all streams in this innerwindow.
auto* window = nsGlobalWindowInner::GetInnerWindowWithId(aWindowID);
if (!window || !window->IsCurrentInnerWindow()) {
return;
if (RefPtr<GetUserMediaWindowListener> listener =
GetWindowListener(aWindowID)) {
listener->StopSharing();
}
IterateWindowListeners(
window, [](const RefPtr<GetUserMediaWindowListener>& aListener) {
aListener->StopSharing();
});
}
template <typename FunctionType>