diff --git a/dom/media/MediaManager.cpp b/dom/media/MediaManager.cpp index fd4ed5485b62..c37fe264f757 100644 --- a/dom/media/MediaManager.cpp +++ b/dom/media/MediaManager.cpp @@ -2074,7 +2074,7 @@ MediaManager::GetUserMedia(nsPIDOMWindowInner* aWindow, return NS_ERROR_UNEXPECTED; } bool loop = IsLoop(docURI); - bool privileged = loop || IsPrivileged(); + bool privileged = IsPrivileged(); bool isHTTPS = false; docURI->SchemeIs("https", &isHTTPS); nsCString host; @@ -2168,7 +2168,7 @@ MediaManager::GetUserMedia(nsPIDOMWindowInner* aWindow, false) && !IsVistaOrLater()) || #endif (!privileged && !HostIsHttps(*docURI)) || - !(loop || HostHasPermission(*docURI))) { + !HostHasPermission(*docURI)) { RefPtr error = new MediaStreamError(aWindow, NS_LITERAL_STRING("NotAllowedError")); @@ -2213,16 +2213,6 @@ MediaManager::GetUserMedia(nsPIDOMWindowInner* aWindow, } } } - - // For all but tab sharing, Loop needs to prompt as we are using the - // permission menu for selection of the device currently. For tab sharing, - // Loop has implicit permissions within Firefox, as it is built-in, - // and will manage the active tab and provide appropriate UI. - if (loop && (videoType == MediaSourceEnum::Window || - videoType == MediaSourceEnum::Application || - videoType == MediaSourceEnum::Screen)) { - privileged = false; - } } else if (IsOn(c.mVideo)) { videoType = MediaSourceEnum::Camera; }