Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 17:25:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1014393 - Remove MediaRecorder::GetParentObject. r=bryce

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D35308

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Andreas Pehrson 2019-07-31 11:29:54 +00:00
parent e8685eab05
commit b0373ad9e6
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/media/MediaRecorder.cpp
View File

@ -639,7 +639,7 @@ class MediaRecorder::Session : public PrincipalChangeObserver<MediaStreamTrack>,
RefPtr<BlobStorer> storer = MakeAndAddRef<BlobStorer>(); RefPtr<BlobStorer> storer = MakeAndAddRef<BlobStorer>();
MaybeCreateMutableBlobStorage(); MaybeCreateMutableBlobStorage();
mMutableBlobStorage->GetBlobWhenReady( mMutableBlobStorage->GetBlobWhenReady(
mRecorder->GetParentObject(), NS_ConvertUTF16toUTF8(mMimeType), storer); mRecorder->GetOwner(), NS_ConvertUTF16toUTF8(mMimeType), storer);
mMutableBlobStorage = nullptr; mMutableBlobStorage = nullptr;
return storer->Promise(); return storer->Promise();
@ -786,7 +786,7 @@ class MediaRecorder::Session : public PrincipalChangeObserver<MediaStreamTrack>,
// When MediaRecorder supports multiple tracks, we should set up a single // When MediaRecorder supports multiple tracks, we should set up a single
// MediaInputPort from the input stream, and let main thread check // MediaInputPort from the input stream, and let main thread check
// track principals async later. // track principals async later.
nsPIDOMWindowInner* window = mRecorder->GetParentObject(); nsPIDOMWindowInner* window = mRecorder->GetOwner();
Document* document = window ? window->GetExtantDoc() : nullptr; Document* document = window ? window->GetExtantDoc() : nullptr;
nsContentUtils::ReportToConsole(nsIScriptError::errorFlag, nsContentUtils::ReportToConsole(nsIScriptError::errorFlag,
NS_LITERAL_CSTRING("Media"), document, NS_LITERAL_CSTRING("Media"), document,

2
dom/media/MediaRecorder.h
View File

@ -61,8 +61,6 @@ class MediaRecorder final : public DOMEventTargetHelper,
JSObject* WrapObject(JSContext* aCx, JSObject* WrapObject(JSContext* aCx,
JS::Handle<JSObject*> aGivenProto) override; JS::Handle<JSObject*> aGivenProto) override;
nsPIDOMWindowInner* GetParentObject() { return GetOwner(); }
NS_DECL_ISUPPORTS_INHERITED NS_DECL_ISUPPORTS_INHERITED
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(MediaRecorder, DOMEventTargetHelper) NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(MediaRecorder, DOMEventTargetHelper)