Macintosh-SW/tenfourfox
1
0
Fork 0
mirror of https://github.com/classilla/tenfourfox.git synced 2024-06-10 02:29:43 +00:00
Code Issues Projects Releases Wiki Activity

#457: M1419363 + WeakPtr support from M1267918

Browse Source
This commit is contained in:
Cameron Kaiser 2018-01-15 15:29:43 -08:00
parent f1e53a0c01
commit ec2be8cb3f
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/html/HTMLMediaElement.cpp
View File

@ -3110,11 +3110,13 @@ public:
{ {
NS_ASSERTION(NS_IsMainThread(), "Should be on main thread."); NS_ASSERTION(NS_IsMainThread(), "Should be on main thread.");
if (MOZ_UNLIKELY(!mElement)) return; // bug 1419363
mElement->NotifyMediaStreamTracksAvailable(aStream); mElement->NotifyMediaStreamTracksAvailable(aStream);
} }
private: private:
HTMLMediaElement* mElement; WeakPtr<HTMLMediaElement> mElement;
}; };
class HTMLMediaElement::MediaStreamTrackListener : class HTMLMediaElement::MediaStreamTrackListener :

6
dom/html/HTMLMediaElement.h
View File

@ -18,6 +18,7 @@
#include "mozilla/Attributes.h" #include "mozilla/Attributes.h"
#include "mozilla/dom/Promise.h" #include "mozilla/dom/Promise.h"
#include "mozilla/dom/TextTrackManager.h" #include "mozilla/dom/TextTrackManager.h"
#include "mozilla/WeakPtr.h"
#include "MediaDecoder.h" #include "MediaDecoder.h"
#ifdef MOZ_EME #ifdef MOZ_EME
#include "mozilla/dom/MediaKeys.h" #include "mozilla/dom/MediaKeys.h"
@ -76,7 +77,8 @@ class HTMLMediaElement : public nsGenericHTMLElement,
public nsIDOMHTMLMediaElement, public nsIDOMHTMLMediaElement,
public nsIObserver, public nsIObserver,
public MediaDecoderOwner, public MediaDecoderOwner,
public nsIAudioChannelAgentCallback public nsIAudioChannelAgentCallback,
public SupportsWeakPtr<HTMLMediaElement>
{ {
friend AutoNotifyAudioChannelAgent; friend AutoNotifyAudioChannelAgent;
@ -89,6 +91,8 @@ public:
typedef mozilla::MediaDecoderOwner MediaDecoderOwner; typedef mozilla::MediaDecoderOwner MediaDecoderOwner;
typedef mozilla::MetadataTags MetadataTags; typedef mozilla::MetadataTags MetadataTags;
MOZ_DECLARE_WEAKREFERENCE_TYPENAME(HTMLMediaElement)
CORSMode GetCORSMode() { CORSMode GetCORSMode() {
return mCORSMode; return mCORSMode;
} }