corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1266926 - Move CaptureStreamTrackSource cleanup to Destroy method. r=jesup

Browse Source
This commit is contained in:
Andreas Pehrson
2016-05-09 11:52:53 +02:00
parent 50a7e300c6
commit fa58173ec7
3 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dom/html/HTMLMediaElement.cpp
View File

@@ -1908,6 +1908,14 @@ public:
mElement->AddDecoderPrincipalChangeObserver(this);
}
void Destroy() override
{
MOZ_ASSERT(mElement);
DebugOnly<bool> res = mElement->RemoveDecoderPrincipalChangeObserver(this);
NS_ASSERTION(res, "Removing decoder principal changed observer failed. "
"Had it already been removed?");
}
MediaSourceEnum GetMediaSource() const override
{
return MediaSourceEnum::Other;
@@ -1944,11 +1952,6 @@ public:
protected:
virtual ~CaptureStreamTrackSource()
{
if (mElement) {
DebugOnly<bool> res = mElement->RemoveDecoderPrincipalChangeObserver(this);
NS_ASSERTION(res, "Removing decoder principal changed observer failed. "
"Had it already been removed?");
}
}
RefPtr<HTMLMediaElement> mElement;