diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
| commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
| tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /dom/html/HTMLTrackElement.cpp | |
| parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
| download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip | |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'dom/html/HTMLTrackElement.cpp')
| -rw-r--r-- | dom/html/HTMLTrackElement.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/dom/html/HTMLTrackElement.cpp b/dom/html/HTMLTrackElement.cpp index 5363d3e399..e0e31dbb1b 100644 --- a/dom/html/HTMLTrackElement.cpp +++ b/dom/html/HTMLTrackElement.cpp @@ -11,10 +11,9 @@ #include "mozilla/LoadInfo.h" #include "mozilla/StaticPrefs_media.h" #include "mozilla/dom/HTMLTrackElementBinding.h" -#include "mozilla/dom/HTMLUnknownElement.h" +#include "mozilla/dom/UnbindContext.h" #include "nsAttrValueInlines.h" #include "nsCOMPtr.h" -#include "nsContentPolicyUtils.h" #include "nsContentUtils.h" #include "nsCycleCollectionParticipant.h" #include "nsGenericHTMLElement.h" @@ -30,7 +29,6 @@ #include "nsNetUtil.h" #include "nsStyleConsts.h" #include "nsThreadUtils.h" -#include "nsVideoFrame.h" extern mozilla::LazyLogModule gTextTrackLog; #define LOG(msg, ...) \ @@ -408,8 +406,8 @@ nsresult HTMLTrackElement::BindToTree(BindContext& aContext, nsINode& aParent) { return NS_OK; } -void HTMLTrackElement::UnbindFromTree(bool aNullParent) { - if (mMediaParent && aNullParent) { +void HTMLTrackElement::UnbindFromTree(UnbindContext& aContext) { + if (mMediaParent && aContext.IsUnbindRoot(this)) { // mTrack can be null if HTMLTrackElement::LoadResource has never been // called. if (mTrack) { @@ -419,7 +417,7 @@ void HTMLTrackElement::UnbindFromTree(bool aNullParent) { mMediaParent = nullptr; } - nsGenericHTMLElement::UnbindFromTree(aNullParent); + nsGenericHTMLElement::UnbindFromTree(aContext); } TextTrackReadyState HTMLTrackElement::ReadyState() const { |