Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1608286 - Crash in [@ mozilla::dom::MediaKeySystemAccessManager::CheckDoesWindowSupportProtectedMedia] r=bryce,bzbarsky

Browse Source 
This changes fixes a failfast in a call to Navigator.requestMediaKeySystemAccess for the case where there is no browser available from a window when e10s is on. This can happen when a document is disconnected from the DOM.
The fix is to reject the promise in this case.

Differential Revision: https://phabricator.services.mozilla.com/D60022

--HG--
extra : moz-landing-system : lando
This commit is contained in:
thomasmo 2020-01-22 16:47:26 +00:00
parent 9847ab1f71
commit fa7b42ae1e
3 changed files with 61 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dom/media/eme/MediaKeySystemAccessManager.cpp
View File

@ -134,12 +134,18 @@ void MediaKeySystemAccessManager::CheckDoesWindowSupportProtectedMedia(
RefPtr<BrowserChild> browser(BrowserChild::GetFrom(mWindow));
if (!browser) {
if (!XRE_IsParentProcess() || XRE_IsE10sParentProcess()) {
MOZ_CRASH("BrowserChild should only be unavailable with e10s off");
// In this case, there is no browser because the Navigator object has
// been disconnected from its window. Thus, reject the promise.
aRequest->mPromise->MaybeRejectWithTypeError(
u"Browsing context is no longer available");
} else {
// In this case, there is no browser because e10s is off. Proceed with
// the request with support since this scenario is always supported.
MKSAM_LOG_DEBUG("Allowing protected media on Windows with e10s off.");
OnDoesWindowSupportProtectedMedia(true, std::move(aRequest));
}
MKSAM_LOG_DEBUG("Allowing protected media on Windows with e10s off.");
OnDoesWindowSupportProtectedMedia(true, std::move(aRequest));
return;
}

50
dom/media/test/crashtests/1608286.html Normal file
View File

@ -0,0 +1,50 @@
<html class="reftest-wait">
<head>
<script>
function test() {
function checkResolve(value) {
// Let the test timeout and fail
throw new Error("This promise should not resolve");
}
function checkReject(reason) {
if (reason.message !== "Browsing context is no longer available") {
// Let the test timeout and fail
throw new Error("Unexpected rejected promise reason");
}
// Otherwise, successfully rejected a request not attached to a
// window without crashing
}
var i = document.querySelector("iframe");
var nav = i.contentWindow.navigator;
i.remove();
// First, check with valid args
nav.requestMediaKeySystemAccess(
"com.widevine.alpha",
[{
initDataTypes: ["webm"],
videoCapabilities: [{ contentType: 'video/webm; codecs="vp9"' }]
}]
).then(
checkResolve,
(reason) => {
checkReject(reason);
// Then, check with invalid args
nav.requestMediaKeySystemAccess("", []).then(
checkResolve,
(reason) => {
checkReject(reason);
document.documentElement.removeAttribute("class");
}
);
});
}
</script>
</head>
<body onload="test()">
<iframe></iframe>
</body>
</html>

1
dom/media/test/crashtests/crashtests.list
View File

@ -135,3 +135,4 @@ load 1577184.html
pref(media.autoplay.default,0) load 1587248.html
load 1594466.html
load 1604941.html
load 1608286.html