Fix up leftover merge conflicts.

Tag #26
This commit is contained in:
wolfbeast 2018-02-24 11:37:35 +01:00 committed by Roy Tam
commit b16f7b73d9
2 changed files with 3 additions and 16 deletions

View file

@ -379,10 +379,12 @@ AudioContext::CreateMediaElementSource(HTMLMediaElement& aMediaElement,
return nullptr;
}
#ifdef MOZ_EME
if (aMediaElement.ContainsRestrictedContent()) {
aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
return nullptr;
}
#endif
if (CheckClosed(aRv)) {
return nullptr;