Partial revert "[GStreamer] Misc leak fixes"

This partially reverts commit 1981132, regarding the GStreamerCaptureDeviceManager.

Author: calvaris

Source/WebCore/platform/mediastream/gstreamer/GStreamerCaptureDeviceManager.cpp

@@ -63,39 +63,10 @@ GStreamerVideoCaptureDeviceManager& GStreamerVideoCaptureDeviceManager::singleto
     return manager;
 }
 
-void teardownGStreamerCaptureDeviceManagers()
-{
-    auto& audioManager = GStreamerAudioCaptureDeviceManager::singleton();
-    audioManager.teardown();
-
-    auto& videoManager = GStreamerVideoCaptureDeviceManager::singleton();
-    videoManager.teardown();
-}
-
 GStreamerCaptureDeviceManager::~GStreamerCaptureDeviceManager()
 {
-    teardown();
-}
-
-void GStreamerCaptureDeviceManager::teardown()
-{
-    GST_DEBUG_OBJECT(m_deviceMonitor.get(), "Tearing down");
-    m_isTearingDown = true;
-    stopMonitor();
-    RealtimeMediaSourceCenter::singleton().removeDevicesChangedObserver(*this);
-    m_devices.clear();
-    m_gstreamerDevices.clear();
-}
-
-void GStreamerCaptureDeviceManager::stopMonitor()
-{
-    if (!m_deviceMonitor)
-        return;
-
-    auto bus = adoptGRef(gst_device_monitor_get_bus(m_deviceMonitor.get()));
-    gst_bus_remove_watch(bus.get());
-    gst_device_monitor_stop(m_deviceMonitor.get());
-    m_deviceMonitor.clear();
+    if (m_deviceMonitor)
+        gst_device_monitor_stop(m_deviceMonitor.get());
 }
 
 std::optional<GStreamerCaptureDevice> GStreamerCaptureDeviceManager::gstreamerDeviceWithUID(const String& deviceID)
@@ -116,7 +87,7 @@ const Vector<CaptureDevice>& GStreamerCaptureDeviceManager::captureDevices()
     std::call_once(onceFlag, [] {
         GST_DEBUG_CATEGORY_INIT(webkitGStreamerCaptureDeviceManagerDebugCategory, "webkitcapturedevicemanager", 0, "WebKit Capture Device Manager");
     });
-    if (m_devices.isEmpty() && !m_isTearingDown)
+    if (m_devices.isEmpty())
         refreshCaptureDevices();
 
     return m_devices;
@@ -158,12 +129,7 @@ void GStreamerCaptureDeviceManager::addDevice(GRefPtr<GstDevice>&& device)
 
 void GStreamerCaptureDeviceManager::refreshCaptureDevices()
 {
-    GST_DEBUG_OBJECT(m_deviceMonitor.get(), "Refreshing capture devices");
     m_devices.clear();
-    m_gstreamerDevices.clear();
-    if (m_isTearingDown)
-        return;
-
     if (!m_deviceMonitor) {
         m_deviceMonitor = adoptGRef(gst_device_monitor_new());
 

Source/WebCore/platform/mediastream/gstreamer/GStreamerCaptureDeviceManager.h

@@ -29,34 +29,25 @@
 #include "GStreamerVideoCapturer.h"
 #include "RealtimeMediaSourceFactory.h"
 
-#include <wtf/Noncopyable.h>
-
 namespace WebCore {
 
 using NodeAndFD = GStreamerVideoCapturer::NodeAndFD;
 
-void teardownGStreamerCaptureDeviceManagers();
-
-class GStreamerCaptureDeviceManager : public CaptureDeviceManager
-WTF_MAKE_NONCOPYABLE(GStreamerCaptureDeviceManager)
-{
+class GStreamerCaptureDeviceManager : public CaptureDeviceManager {
 public:
     ~GStreamerCaptureDeviceManager();
     std::optional<GStreamerCaptureDevice> gstreamerDeviceWithUID(const String&);
 
     const Vector<CaptureDevice>& captureDevices() final;
     virtual CaptureDevice::DeviceType deviceType() = 0;
 
-    void teardown();
-
 private:
     void addDevice(GRefPtr<GstDevice>&&);
     void refreshCaptureDevices();
 
     GRefPtr<GstDeviceMonitor> m_deviceMonitor;
     Vector<GStreamerCaptureDevice> m_gstreamerDevices;
     Vector<CaptureDevice> m_devices;
-    bool m_isTearingDown { false };
 };
 
 class GStreamerAudioCaptureDeviceManager final : public GStreamerCaptureDeviceManager {