From 4eb24d2d874a570b26bb3f638c5e35775e66f19e Mon Sep 17 00:00:00 2001
From: Andreas Pehrson <apehrson@mozilla.com>
Date: Fri, 12 Jul 2019 13:41:27 +0000
Subject: [PATCH] Bug 1014393 - Remove MediaRecorder::GetParentObject. r=bryce

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

--HG--
extra : moz-landing-system : lando
---
 dom/media/MediaRecorder.cpp | 4 ++--
 dom/media/MediaRecorder.h   | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dom/media/MediaRecorder.cpp b/dom/media/MediaRecorder.cpp
index 2096aeac19e1..6a708508e7ef 100644
--- a/dom/media/MediaRecorder.cpp
+++ b/dom/media/MediaRecorder.cpp
@@ -635,7 +635,7 @@ class MediaRecorder::Session : public PrincipalChangeObserver<MediaStreamTrack>,
     RefPtr<BlobStorer> storer = MakeAndAddRef<BlobStorer>();
     MaybeCreateMutableBlobStorage();
     mMutableBlobStorage->GetBlobWhenReady(
-        mRecorder->GetParentObject(), NS_ConvertUTF16toUTF8(mMimeType), storer);
+        mRecorder->GetOwner(), NS_ConvertUTF16toUTF8(mMimeType), storer);
     mMutableBlobStorage = nullptr;
 
     return storer->Promise();
@@ -782,7 +782,7 @@ class MediaRecorder::Session : public PrincipalChangeObserver<MediaStreamTrack>,
       // When MediaRecorder supports multiple tracks, we should set up a single
       // MediaInputPort from the input stream, and let main thread check
       // track principals async later.
-      nsPIDOMWindowInner* window = mRecorder->GetParentObject();
+      nsPIDOMWindowInner* window = mRecorder->GetOwner();
       Document* document = window ? window->GetExtantDoc() : nullptr;
       nsContentUtils::ReportToConsole(nsIScriptError::errorFlag,
                                       NS_LITERAL_CSTRING("Media"), document,
diff --git a/dom/media/MediaRecorder.h b/dom/media/MediaRecorder.h
index 0debcf026bc2..cc02126b5b6e 100644
--- a/dom/media/MediaRecorder.h
+++ b/dom/media/MediaRecorder.h
@@ -61,8 +61,6 @@ class MediaRecorder final : public DOMEventTargetHelper,
   JSObject* WrapObject(JSContext* aCx,
                        JS::Handle<JSObject*> aGivenProto) override;
 
-  nsPIDOMWindowInner* GetParentObject() { return GetOwner(); }
-
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(MediaRecorder, DOMEventTargetHelper)