Unreviewed, reverting 272410@main.

webkit-commit-queue · eocanha · commit 15f95679a451 · 2023-12-28T13:40:54.000+01:00
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
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
@@ -142,10 +142,8 @@ TrackPrivateBaseGStreamer::~TrackPrivateBaseGStreamer()
 
 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();
 
@@ -157,11 +155,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()

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,6 @@ class AbortableTaskQueue final {`
`75`	`75`	`ASSERT(isMainThread());`
`76`	`76`	`ASSERT(!m_lock.isHeld());`
`77`	`77`	`ASSERT(m_channel.isEmpty());`
`78`		`- startAborting();`
`79`	`78`	`}`
`80`	`79`
`81`	`80`	`// ===========================`
Original file line number	Diff line number	Diff line change
`@@ -142,10 +142,8 @@ TrackPrivateBaseGStreamer::~TrackPrivateBaseGStreamer()`
`142`	`142`
`143`	`143`	`void TrackPrivateBaseGStreamer::disconnect()`
`144`	`144`	`{`
`145`		`- if (m_stream) {`
	`145`	`+ if (m_stream)`
`146`	`146`	`g_signal_handlers_disconnect_matched(m_stream.get(), G_SIGNAL_MATCH_DATA, 0, 0, nullptr, nullptr, this);`
`147`		`- ASSERT(!g_signal_handler_find(m_stream.get(), G_SIGNAL_MATCH_UNBLOCKED, 0, 0, nullptr, nullptr, nullptr));`
`148`		`- }`
`149`	`147`
`150`	`148`	`m_tags.clear();`
`151`	`149`
`@@ -157,11 +155,8 @@ void TrackPrivateBaseGStreamer::disconnect()`
`157`	`155`	`m_bestUpstreamPad.clear();`
`158`	`156`	`}`
`159`	`157`
`160`		`- if (m_pad) {`
`161`		`- g_signal_handlers_disconnect_matched(m_pad.get(), G_SIGNAL_MATCH_DATA, 0, 0, nullptr, nullptr, this);`
`162`		`- ASSERT(!g_signal_handler_find(m_pad.get(), G_SIGNAL_MATCH_UNBLOCKED, 0, 0, nullptr, nullptr, nullptr));`
	`158`	`+ if (m_pad)`
`163`	`159`	`m_pad.clear();`
`164`		`- }`
`165`	`160`	`}`
`166`	`161`
`167`	`162`	`void TrackPrivateBaseGStreamer::tagsChanged()`