Merge remote-tracking branch 'origin/tracking' into custom

This commit is contained in:
roytam1 2023-09-14 10:49:05 +08:00
commit 0c6e087291
55 changed files with 320 additions and 34 deletions

View file

@ -29,7 +29,9 @@
#include "mozilla/dom/VideoTrack.h"
#include "mozilla/dom/VideoTrackList.h"
#include "nsPrintfCString.h"
#ifdef MOZ_GMP
#include "GMPService.h"
#endif
#include "Layers.h"
#include "mozilla/layers/ShadowLayers.h"
@ -929,6 +931,7 @@ MediaDecoder::OwnerHasError() const
return mOwner->HasError();
}
#ifdef MOZ_GMP
class MediaElementGMPCrashHelper : public GMPCrashHelper
{
public:
@ -956,6 +959,7 @@ MediaDecoder::GetCrashHelper()
return mOwner->GetMediaElement() ?
MakeAndAddRef<MediaElementGMPCrashHelper>(mOwner->GetMediaElement()) : nullptr;
}
#endif
bool
MediaDecoder::IsEnded() const