mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1133583 - pass window in EME notifications instead of null subject, r=cpearce
This commit is contained in:
parent
6c522c80a9
commit
4ba90150ce
@ -2611,7 +2611,7 @@ Navigator::RequestMediaKeySystemAccess(const nsAString& aKeySystem,
|
||||
if (!Preferences::GetBool("media.eme.enabled", false)) {
|
||||
// EME disabled by user, send notification to chrome so UI can
|
||||
// inform user.
|
||||
MediaKeySystemAccess::NotifyObservers(aKeySystem,
|
||||
MediaKeySystemAccess::NotifyObservers(mWindow, aKeySystem,
|
||||
MediaKeySystemStatus::Api_disabled);
|
||||
p->MaybeReject(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
|
||||
return p.forget();
|
||||
@ -2629,7 +2629,7 @@ Navigator::RequestMediaKeySystemAccess(const nsAString& aKeySystem,
|
||||
// Failed due to user disabling something, send a notification to
|
||||
// chrome, so we can show some UI to explain how the user can rectify
|
||||
// the situation.
|
||||
MediaKeySystemAccess::NotifyObservers(aKeySystem, status);
|
||||
MediaKeySystemAccess::NotifyObservers(mWindow, aKeySystem, status);
|
||||
}
|
||||
p->MaybeReject(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
|
||||
return p.forget();
|
||||
|
@ -226,7 +226,8 @@ MediaKeySystemAccess::IsSupported(const nsAString& aKeySystem,
|
||||
|
||||
/* static */
|
||||
void
|
||||
MediaKeySystemAccess::NotifyObservers(const nsAString& aKeySystem,
|
||||
MediaKeySystemAccess::NotifyObservers(nsIDOMWindow* aWindow,
|
||||
const nsAString& aKeySystem,
|
||||
MediaKeySystemStatus aStatus)
|
||||
{
|
||||
RequestMediaKeySystemAccessNotification data;
|
||||
@ -236,7 +237,7 @@ MediaKeySystemAccess::NotifyObservers(const nsAString& aKeySystem,
|
||||
data.ToJSON(json);
|
||||
nsCOMPtr<nsIObserverService> obs = services::GetObserverService();
|
||||
if (obs) {
|
||||
obs->NotifyObservers(nullptr, "mediakeys-request", json.get());
|
||||
obs->NotifyObservers(aWindow, "mediakeys-request", json.get());
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -49,7 +49,8 @@ public:
|
||||
static bool IsSupported(const nsAString& aKeySystem,
|
||||
const Sequence<MediaKeySystemOptions>& aOptions);
|
||||
|
||||
static void NotifyObservers(const nsAString& aKeySystem,
|
||||
static void NotifyObservers(nsIDOMWindow* aWindow,
|
||||
const nsAString& aKeySystem,
|
||||
MediaKeySystemStatus aStatus);
|
||||
|
||||
private:
|
||||
|
@ -367,7 +367,8 @@ MediaKeys::OnCDMCreated(PromiseId aId, const nsACString& aNodeId)
|
||||
Release();
|
||||
}
|
||||
|
||||
MediaKeySystemAccess::NotifyObservers(mKeySystem,
|
||||
MediaKeySystemAccess::NotifyObservers(mParent,
|
||||
mKeySystem,
|
||||
MediaKeySystemStatus::Cdm_created);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user