Changeset 278286 in webkit

Timestamp:

May 31, 2021, 5:04:51 PM (5 years ago)

Author:

Chris Dumez

Message:

Stop using WTF_IGNORES_THREAD_SAFETY_ANALYSIS in MediaRecorderPrivateWriter code
​https://bugs.webkit.org/show_bug.cgi?id=226446

Reviewed by Darin Adler.

Fold MediaRecorderPrivateWriter::clear() into the destructor since this is the
only place it is called. This allows us to stop using WTF_IGNORES_THREAD_SAFETY_ANALYSIS
since thread safety checks do not apply to destructors.

• platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.h:
• platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm:

(WebCore::MediaRecorderPrivateWriter::~MediaRecorderPrivateWriter):
(): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.h (modified) (1 diff)
• platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-05-31  Chris Dumez  <cdumez@apple.com>
+
+        Stop using WTF_IGNORES_THREAD_SAFETY_ANALYSIS in MediaRecorderPrivateWriter code
+        https://bugs.webkit.org/show_bug.cgi?id=226446
+
+        Reviewed by Darin Adler.
+
+        Fold MediaRecorderPrivateWriter::clear() into the destructor since this is the
+        only place it is called. This allows us to stop using WTF_IGNORES_THREAD_SAFETY_ANALYSIS
+        since thread safety checks do not apply to destructors.
+
+        * platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.h:
+        * platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm:
+        (WebCore::MediaRecorderPrivateWriter::~MediaRecorderPrivateWriter):
+        (): Deleted.
+
 2021-05-31  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.h

@@ -84 +84 @@
 private:
     MediaRecorderPrivateWriter(bool hasAudio, bool hasVideo);
-    void clear();
 
     bool initialize(const MediaRecorderPrivateOptions&);

trunk/Source/WebCore/platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm

@@ -128 +128 @@
 MediaRecorderPrivateWriter::~MediaRecorderPrivateWriter()
 {
-    clear();
+    m_pendingAudioSampleQueue.clear();
+    m_pendingVideoSampleQueue.clear();
+    if (m_writer) {
+        [m_writer cancelWriting];
+        m_writer.clear();
+    }
+
+    // At this pointer, we should no longer be writing any data, so it should be safe to close and nullify m_data without locking.
+    if (m_writerDelegate)
+        [m_writerDelegate close];
+    m_data = nullptr;
+
+    if (auto completionHandler = WTFMove(m_fetchDataCompletionHandler))
+        completionHandler(nullptr, 0);
 }
 
@@ -367 +380 @@
 }
 
-// FIXME: This modifies m_data without grabbing m_dataLock.
-void MediaRecorderPrivateWriter::clear() WTF_IGNORES_THREAD_SAFETY_ANALYSIS
-{
-    m_pendingAudioSampleQueue.clear();
-    m_pendingVideoSampleQueue.clear();
-    if (m_writer) {
-        [m_writer cancelWriting];
-        m_writer.clear();
-    }
-
-    // At this pointer, we should no longer be writing any data, so it should be safe to close and nullify m_data without locking.
-    if (m_writerDelegate)
-        [m_writerDelegate close];
-    m_data = nullptr;
-
-    if (auto completionHandler = WTFMove(m_fetchDataCompletionHandler))
-        completionHandler(nullptr, 0);
-}
-
-
 static inline RetainPtr<CMSampleBufferRef> copySampleBufferWithCurrentTimeStamp(CMSampleBufferRef originalBuffer, CMTime startTime)
 {