From f67e22d3f095de7af3ecd020c5445bd0c4b7e572 Mon Sep 17 00:00:00 2001 From: roytam1 Date: Mon, 20 Jan 2025 21:31:50 +0800 Subject: [PATCH] Issue #2678 - addendum to rev 139e7a7a --- dom/archivereader/ArchiveRequest.cpp | 2 +- dom/media/eme/MediaEncryptedEvent.cpp | 2 +- dom/media/eme/MediaKeyMessageEvent.cpp | 2 +- dom/media/eme/MediaKeySession.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dom/archivereader/ArchiveRequest.cpp b/dom/archivereader/ArchiveRequest.cpp index 36183155a7..cc559d7cb4 100644 --- a/dom/archivereader/ArchiveRequest.cpp +++ b/dom/archivereader/ArchiveRequest.cpp @@ -271,7 +271,7 @@ ArchiveRequest::Create(nsPIDOMWindowInner* aOwner, NS_IMPL_CYCLE_COLLECTION_INHERITED(ArchiveRequest, DOMRequest, mArchiveReader) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ArchiveRequest) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ArchiveRequest) NS_INTERFACE_MAP_END_INHERITING(DOMRequest) NS_IMPL_ADDREF_INHERITED(ArchiveRequest, DOMRequest) diff --git a/dom/media/eme/MediaEncryptedEvent.cpp b/dom/media/eme/MediaEncryptedEvent.cpp index a9c83291e9..5a58baae5d 100644 --- a/dom/media/eme/MediaEncryptedEvent.cpp +++ b/dom/media/eme/MediaEncryptedEvent.cpp @@ -30,7 +30,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(MediaEncryptedEvent, Event) mozilla::DropJSObjects(this); NS_IMPL_CYCLE_COLLECTION_UNLINK_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(MediaEncryptedEvent) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(MediaEncryptedEvent) NS_INTERFACE_MAP_END_INHERITING(Event) MediaEncryptedEvent::MediaEncryptedEvent(EventTarget* aOwner) diff --git a/dom/media/eme/MediaKeyMessageEvent.cpp b/dom/media/eme/MediaKeyMessageEvent.cpp index ee13f8d26f..20cd3eea0f 100644 --- a/dom/media/eme/MediaKeyMessageEvent.cpp +++ b/dom/media/eme/MediaKeyMessageEvent.cpp @@ -34,7 +34,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(MediaKeyMessageEvent, Event) mozilla::DropJSObjects(this); NS_IMPL_CYCLE_COLLECTION_UNLINK_END -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(MediaKeyMessageEvent) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(MediaKeyMessageEvent) NS_INTERFACE_MAP_END_INHERITING(Event) MediaKeyMessageEvent::MediaKeyMessageEvent(EventTarget* aOwner) diff --git a/dom/media/eme/MediaKeySession.cpp b/dom/media/eme/MediaKeySession.cpp index b5f3fe498b..d6876655de 100644 --- a/dom/media/eme/MediaKeySession.cpp +++ b/dom/media/eme/MediaKeySession.cpp @@ -31,7 +31,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(MediaKeySession, mKeyStatusMap, mClosed) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(MediaKeySession) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(MediaKeySession) NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) NS_IMPL_ADDREF_INHERITED(MediaKeySession, DOMEventTargetHelper)