Unreviewed, reverting 272410@main.

https://bugs.webkit.org/show_bug.cgi?id=266899 triggered ASSERTs on Debug bots Reverted changeset: "[GStreamer] Fix delayed dispatch of async task post MediaPlayer destruction" https://bugs.webkit.org/show_bug.cgi?id=266715 https://commits.webkit.org/272410@main Canonical link: https://commits.webkit.org/272502@main
WebKit · Dec 26, 2023 · 6248d02 · 6248d02
1 parent 359a95f
commit 6248d02
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/Source/WebCore/platform/AbortableTaskQueue.h b/Source/WebCore/platform/AbortableTaskQueue.h
@@ -75,7 +75,6 @@ class AbortableTaskQueue final {
         ASSERT(isMainThread());
         ASSERT(!m_lock.isHeld());
         ASSERT(m_channel.isEmpty());
-        startAborting();
     }
 
     // ===========================

diff --git a/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp
@@ -170,10 +170,8 @@ GstObject* TrackPrivateBaseGStreamer::objectForLogging() const
 
 void TrackPrivateBaseGStreamer::disconnect()
 {
-    if (m_stream) {
+    if (m_stream)
         g_signal_handlers_disconnect_matched(m_stream.get(), G_SIGNAL_MATCH_DATA, 0, 0, nullptr, nullptr, this);
-        ASSERT(!g_signal_handler_find(m_stream.get(), G_SIGNAL_MATCH_UNBLOCKED, 0, 0, nullptr, nullptr, nullptr));
-    }
 
     m_tags.clear();
 
@@ -185,11 +183,8 @@ void TrackPrivateBaseGStreamer::disconnect()
         m_bestUpstreamPad.clear();
     }
 
-    if (m_pad) {
-        g_signal_handlers_disconnect_matched(m_pad.get(), G_SIGNAL_MATCH_DATA, 0, 0, nullptr, nullptr, this);
-        ASSERT(!g_signal_handler_find(m_pad.get(), G_SIGNAL_MATCH_UNBLOCKED, 0, 0, nullptr, nullptr, nullptr));
+    if (m_pad)
         m_pad.clear();
-    }
 }
 
 void TrackPrivateBaseGStreamer::tagsChanged()