summaryrefslogtreecommitdiffstats
path: root/dom/media/eme
diff options
context:
space:
mode:
Diffstat (limited to 'dom/media/eme')
-rw-r--r--dom/media/eme/CDMProxy.h4
-rw-r--r--dom/media/eme/MediaKeys.cpp2
-rw-r--r--dom/media/eme/MediaKeys.h2
-rw-r--r--dom/media/eme/mediadrm/MediaDrmCDMProxy.cpp2
-rw-r--r--dom/media/eme/mediadrm/MediaDrmCDMProxy.h3
5 files changed, 7 insertions, 6 deletions
diff --git a/dom/media/eme/CDMProxy.h b/dom/media/eme/CDMProxy.h
index 53e3a37..d0f7181 100644
--- a/dom/media/eme/CDMProxy.h
+++ b/dom/media/eme/CDMProxy.h
@@ -82,7 +82,7 @@ class CDMProxy {
// Main thread only.
CDMProxy(dom::MediaKeys* aKeys, const nsAString& aKeySystem,
bool aDistinctiveIdentifierRequired, bool aPersistentStateRequired,
- nsIEventTarget* aMainThread)
+ nsISerialEventTarget* aMainThread)
: mKeys(aKeys),
mKeySystem(aKeySystem),
mCapabilites("CDMProxy::mCDMCaps"),
@@ -272,7 +272,7 @@ class CDMProxy {
const bool mPersistentStateRequired;
// The main thread associated with the root document.
- const nsCOMPtr<nsIEventTarget> mMainThread;
+ const nsCOMPtr<nsISerialEventTarget> mMainThread;
};
} // namespace mozilla
diff --git a/dom/media/eme/MediaKeys.cpp b/dom/media/eme/MediaKeys.cpp
index 0434418..de2953a 100644
--- a/dom/media/eme/MediaKeys.cpp
+++ b/dom/media/eme/MediaKeys.cpp
@@ -307,7 +307,7 @@ class MediaKeysGMPCrashHelper : public GMPCrashHelper {
};
already_AddRefed<CDMProxy> MediaKeys::CreateCDMProxy(
- nsIEventTarget* aMainThread) {
+ nsISerialEventTarget* aMainThread) {
RefPtr<CDMProxy> proxy;
#ifdef MOZ_WIDGET_ANDROID
if (IsWidevineKeySystem(mKeySystem)) {
diff --git a/dom/media/eme/MediaKeys.h b/dom/media/eme/MediaKeys.h
index 8661d54..128c968 100644
--- a/dom/media/eme/MediaKeys.h
+++ b/dom/media/eme/MediaKeys.h
@@ -148,7 +148,7 @@ class MediaKeys final : public nsISupports,
// Instantiate CDMProxy instance.
// It could be MediaDrmCDMProxy (Widevine on Fennec) or ChromiumCDMProxy (the
// rest).
- already_AddRefed<CDMProxy> CreateCDMProxy(nsIEventTarget* aMainThread);
+ already_AddRefed<CDMProxy> CreateCDMProxy(nsISerialEventTarget* aMainThread);
// Removes promise from mPromises, and returns it.
already_AddRefed<DetailedPromise> RetrievePromise(PromiseId aId);
diff --git a/dom/media/eme/mediadrm/MediaDrmCDMProxy.cpp b/dom/media/eme/mediadrm/MediaDrmCDMProxy.cpp
index f8a81e8..3bb8678 100644
--- a/dom/media/eme/mediadrm/MediaDrmCDMProxy.cpp
+++ b/dom/media/eme/mediadrm/MediaDrmCDMProxy.cpp
@@ -28,7 +28,7 @@ MediaDrmCDMProxy::MediaDrmCDMProxy(dom::MediaKeys* aKeys,
const nsAString& aKeySystem,
bool aDistinctiveIdentifierRequired,
bool aPersistentStateRequired,
- nsIEventTarget* aMainThread)
+ nsISerialEventTarget* aMainThread)
: CDMProxy(aKeys, aKeySystem, aDistinctiveIdentifierRequired,
aPersistentStateRequired, aMainThread),
mCDM(nullptr),
diff --git a/dom/media/eme/mediadrm/MediaDrmCDMProxy.h b/dom/media/eme/mediadrm/MediaDrmCDMProxy.h
index cc0d4f2..92463ed 100644
--- a/dom/media/eme/mediadrm/MediaDrmCDMProxy.h
+++ b/dom/media/eme/mediadrm/MediaDrmCDMProxy.h
@@ -31,7 +31,8 @@ class MediaDrmCDMProxy : public CDMProxy {
MediaDrmCDMProxy(dom::MediaKeys* aKeys, const nsAString& aKeySystem,
bool aDistinctiveIdentifierRequired,
- bool aPersistentStateRequired, nsIEventTarget* aMainThread);
+ bool aPersistentStateRequired,
+ nsISerialEventTarget* aMainThread);
void Init(PromiseId aPromiseId, const nsAString& aOrigin,
const nsAString& aTopLevelOrigin,