Revert "Cherry-pick 56b164c. rdar://122444388"

This reverts commit 1b021b8. Identifier: 272448.543@safari-7618.1.15.11-branch
WebKit · Feb 10, 2024 · 27352c3 · 27352c3
1 parent 3cb1353
commit 27352c3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h b/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h
@@ -215,7 +215,7 @@ ALLOW_NEW_API_WITHOUT_GUARDS_END
 ALLOW_NEW_API_WITHOUT_GUARDS_BEGIN
     StdUnorderedMap<TrackID, RetainPtr<AVSampleBufferAudioRenderer>> m_audioRenderers;
 ALLOW_NEW_API_WITHOUT_GUARDS_END
-    Ref<WebAVSampleBufferListener> m_listener;
+    RefPtr<WebAVSampleBufferListener> m_listener;
 #if PLATFORM(IOS_FAMILY)
     bool m_displayLayerWasInterrupted { false };
 #endif

diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm
@@ -143,7 +143,6 @@ static inline bool shouldAddContentKeyRecipients()
     destroyStreamDataParser();
     destroyRenderers();
     clearTracks();
-    m_listener->invalidate();
 
     abort();
 }
@@ -505,6 +504,11 @@ static inline bool shouldAddContentKeyRecipients()
 #endif
     }
 
+    if (m_listener) {
+        m_listener->invalidate();
+        m_listener = nullptr;
+    }
+
     m_audioRenderers.clear();
 }
 
@@ -1245,6 +1249,7 @@ static inline bool shouldAddContentKeyRecipients()
     ASSERT(!layer || !m_decompressionSession || hasSelectedVideo());
 
     if (m_videoLayer) {
+        ASSERT(m_listener);
         m_videoLayer->flush();
         m_videoLayer->stopRequestingMediaData();
         m_listener->stopObservingLayer(m_videoLayer->displayLayer());