Bug 1856695 - Improve how we handle MIDI port

goastian · Oct 23, 2023 · 49119c8 · 49119c8
1 parent 175d6f4
commit 49119c8
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 28 deletions.
diff --git a/dom/midi/MIDIInput.cpp b/dom/midi/MIDIInput.cpp
@@ -16,18 +16,18 @@
 
 namespace mozilla::dom {
 
-MIDIInput::MIDIInput(nsPIDOMWindowInner* aWindow, MIDIAccess* aMIDIAccessParent)
-    : MIDIPort(aWindow, aMIDIAccessParent), mKeepAlive(false) {}
+MIDIInput::MIDIInput(nsPIDOMWindowInner* aWindow)
+    : MIDIPort(aWindow), mKeepAlive(false) {}
 
 // static
-MIDIInput* MIDIInput::Create(nsPIDOMWindowInner* aWindow,
-                             MIDIAccess* aMIDIAccessParent,
-                             const MIDIPortInfo& aPortInfo,
-                             const bool aSysexEnabled) {
+RefPtr<MIDIInput> MIDIInput::Create(nsPIDOMWindowInner* aWindow,
+                                    MIDIAccess* aMIDIAccessParent,
+                                    const MIDIPortInfo& aPortInfo,
+                                    const bool aSysexEnabled) {
   MOZ_ASSERT(static_cast<MIDIPortType>(aPortInfo.type()) ==
              MIDIPortType::Input);
-  auto* port = new MIDIInput(aWindow, aMIDIAccessParent);
-  if (!port->Initialize(aPortInfo, aSysexEnabled)) {
+  RefPtr<MIDIInput> port = new MIDIInput(aWindow);
+  if (!port->Initialize(aPortInfo, aSysexEnabled, aMIDIAccessParent)) {
     return nullptr;
   }
   return port;

diff --git a/dom/midi/MIDIInput.h b/dom/midi/MIDIInput.h
@@ -21,11 +21,10 @@ class MIDIPortInfo;
  */
 class MIDIInput final : public MIDIPort {
  public:
-  static MIDIInput* Create(nsPIDOMWindowInner* aWindow,
-                           MIDIAccess* aMIDIAccessParent,
-                           const MIDIPortInfo& aPortInfo,
-                           const bool aSysexEnabled);
-  ~MIDIInput() = default;
+static RefPtr<MIDIInput> Create(nsPIDOMWindowInner* aWindow,
+                                  MIDIAccess* aMIDIAccessParent,
+                                  const MIDIPortInfo& aPortInfo,
+                                  const bool aSysexEnabled);
 
   JSObject* WrapObject(JSContext* aCx,
                        JS::Handle<JSObject*> aGivenProto) override;
@@ -37,7 +36,7 @@ class MIDIInput final : public MIDIPort {
   void DisconnectFromOwner() override;
 
  private:
-  MIDIInput(nsPIDOMWindowInner* aWindow, MIDIAccess* aMIDIAccessParent);
+  explicit MIDIInput(nsPIDOMWindowInner* aWindow);
   // Takes an array of IPC MIDIMessage objects and turns them into
   // MIDIMessageEvents, which it then fires.
   void Receive(const nsTArray<MIDIMessage>& aMsgs) override;

diff --git a/dom/midi/MIDIOutput.cpp b/dom/midi/MIDIOutput.cpp
@@ -18,19 +18,18 @@
 using namespace mozilla;
 using namespace mozilla::dom;
 
-MIDIOutput::MIDIOutput(nsPIDOMWindowInner* aWindow,
-                       MIDIAccess* aMIDIAccessParent)
-    : MIDIPort(aWindow, aMIDIAccessParent) {}
+MIDIOutput::MIDIOutput(nsPIDOMWindowInner* aWindow) : MIDIPort(aWindow) {}
 
 // static
-MIDIOutput* MIDIOutput::Create(nsPIDOMWindowInner* aWindow,
-                               MIDIAccess* aMIDIAccessParent,
-                               const MIDIPortInfo& aPortInfo,
-                               const bool aSysexEnabled) {
+RefPtr<MIDIOutput> MIDIOutput::Create(nsPIDOMWindowInner* aWindow,
+                                      MIDIAccess* aMIDIAccessParent,
+                                      const MIDIPortInfo& aPortInfo,
+                                      const bool aSysexEnabled) {
   MOZ_ASSERT(static_cast<MIDIPortType>(aPortInfo.type()) ==
              MIDIPortType::Output);
-  auto* port = new MIDIOutput(aWindow, aMIDIAccessParent);
-  if (NS_WARN_IF(!port->Initialize(aPortInfo, aSysexEnabled))) {
+  RefPtr<MIDIOutput> port = new MIDIOutput(aWindow);
+  if (NS_WARN_IF(
+          !port->Initialize(aPortInfo, aSysexEnabled, aMIDIAccessParent))) {
     return nullptr;
   }
   return port;

diff --git a/dom/midi/MIDIOutput.h b/dom/midi/MIDIOutput.h
@@ -27,10 +27,10 @@ class MIDIMessage;
  */
 class MIDIOutput final : public MIDIPort {
  public:
-  static MIDIOutput* Create(nsPIDOMWindowInner* aWindow,
-                            MIDIAccess* aMIDIAccessParent,
-                            const MIDIPortInfo& aPortInfo,
-                            const bool aSysexEnabled);
+  static RefPtr<MIDIOutput> Create(nsPIDOMWindowInner* aWindow,
+                                   MIDIAccess* aMIDIAccessParent,
+                                   const MIDIPortInfo& aPortInfo,
+                                   const bool aSysexEnabled);
   ~MIDIOutput() = default;
 
   JSObject* WrapObject(JSContext* aCx,
@@ -43,7 +43,7 @@ class MIDIOutput final : public MIDIPort {
   void Clear();
 
  private:
-  MIDIOutput(nsPIDOMWindowInner* aWindow, MIDIAccess* aMIDIAccessParent);
+  explicit MIDIOutput(nsPIDOMWindowInner* aWindow);
 };
 
 }  // namespace dom