Changeset 267505 in webkit

Timestamp:

Sep 23, 2020, 4:06:16 PM (6 years ago)

Author:

Chris Dumez

Message:

Use less explicit ref() / deref() calls in WebAudio code
​https://bugs.webkit.org/show_bug.cgi?id=216894

Reviewed by Darin Adler.

• Modules/webaudio/BaseAudioContext.cpp:

(WebCore::BaseAudioContext::clearPendingActivity):
(WebCore::BaseAudioContext::makePendingActivity):

• Modules/webaudio/MediaElementAudioSourceNode.cpp:

(WebCore::MediaElementAudioSourceNode::setFormat):
(WebCore::MediaElementAudioSourceNode::process):

• Modules/webaudio/MediaElementAudioSourceNode.h:
• Modules/webaudio/OfflineAudioDestinationNode.cpp:

(WebCore::OfflineAudioDestinationNode::startRendering):

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::mediaEngineWasUpdated):
(WebCore::HTMLMediaElement::createMediaPlayer):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/webaudio/BaseAudioContext.cpp (modified) (1 diff)
• Modules/webaudio/MediaElementAudioSourceNode.cpp (modified) (4 diffs)
• Modules/webaudio/MediaElementAudioSourceNode.h (modified) (2 diffs)
• Modules/webaudio/OfflineAudioDestinationNode.cpp (modified) (2 diffs)
• html/HTMLMediaElement.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-23  Chris Dumez  <cdumez@apple.com>
+
+        Use less explicit ref() / deref() calls in WebAudio code
+        https://bugs.webkit.org/show_bug.cgi?id=216894
+
+        Reviewed by Darin Adler.
+
+        * Modules/webaudio/BaseAudioContext.cpp:
+        (WebCore::BaseAudioContext::clearPendingActivity):
+        (WebCore::BaseAudioContext::makePendingActivity):
+        * Modules/webaudio/MediaElementAudioSourceNode.cpp:
+        (WebCore::MediaElementAudioSourceNode::setFormat):
+        (WebCore::MediaElementAudioSourceNode::process):
+        * Modules/webaudio/MediaElementAudioSourceNode.h:
+        * Modules/webaudio/OfflineAudioDestinationNode.cpp:
+        (WebCore::OfflineAudioDestinationNode::startRendering):
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::mediaEngineWasUpdated):
+        (WebCore::HTMLMediaElement::createMediaPlayer):
+
 2020-09-23  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/Modules/webaudio/BaseAudioContext.cpp

@@ -1304 +1304 @@
 void BaseAudioContext::clearPendingActivity()
 {
+    m_pendingActivity = nullptr;
+}
+
+void BaseAudioContext::makePendingActivity()
+{
     if (!m_pendingActivity)
-        return;
-    m_pendingActivity = nullptr;
-    // FIXME: Remove this specific deref() and ref() call in makePendingActivity().
-    deref();
-}
-
-void BaseAudioContext::makePendingActivity()
-{
-    if (m_pendingActivity)
-        return;
-    m_pendingActivity = ActiveDOMObject::makePendingActivity(*this);
-    ref();
+        m_pendingActivity = ActiveDOMObject::makePendingActivity(*this);
 }
 

trunk/Source/WebCore/Modules/webaudio/MediaElementAudioSourceNode.cpp

@@ -86 +86 @@
 void MediaElementAudioSourceNode::setFormat(size_t numberOfChannels, float sourceSampleRate)
 {
+    auto protectedThis = makeRef(*this);
     m_muted = wouldTaintOrigin();
 
@@ -101 +102 @@
 
         // Synchronize with process().
-        auto locker = holdLock(*this);
+        auto locker = holdLock(m_processLock);
 
         if (sourceSampleRate != sampleRate()) {
@@ -147 +148 @@
     // If we fail to acquire the lock then the HTMLMediaElement must be in the middle of
     // reconfiguring its playback engine, so we output silence in this case.
-    std::unique_lock<Lock> lock(m_processMutex, std::try_to_lock);
+    std::unique_lock<Lock> lock(m_processLock, std::try_to_lock);
     if (!lock.owns_lock()) {
         // We failed to acquire the lock.
@@ -178 +179 @@
 }
 
-void MediaElementAudioSourceNode::lock()
-{
-    ref();
-    m_processMutex.lock();
-}
-
-void MediaElementAudioSourceNode::unlock()
-{
-    m_processMutex.unlock();
-    deref();
-}
-
 } // namespace WebCore
 

trunk/Source/WebCore/Modules/webaudio/MediaElementAudioSourceNode.h

@@ -56 +56 @@
     void setFormat(size_t numberOfChannels, float sampleRate) override;
 
-    void lock();
-    void unlock();
+    Lock& processLock() { return m_processLock; }
 
 private:
@@ -72 +71 @@
 
     Ref<HTMLMediaElement> m_mediaElement;
-    Lock m_processMutex;
+    Lock m_processLock;
 
     unsigned m_sourceNumberOfChannels { 0 };

trunk/Source/WebCore/Modules/webaudio/OfflineAudioDestinationNode.cpp

@@ -96 +96 @@
 
     m_startedRendering = true;
-    ref();
+    auto protectedThis = makeRef(*this);
+
     // FIXME: Should we call lazyInitialize here?
     // FIXME: We should probably limit the number of threads we create for offline audio.
-    m_renderThread = Thread::create("offline renderer", [this] {
+    m_renderThread = Thread::create("offline renderer", [this, protectedThis = WTFMove(protectedThis)]() mutable {
         auto result = offlineRender();
-        callOnMainThread([this, result, currentSampleFrame = m_currentSampleFrame] {
+        callOnMainThread([this, result, currentSampleFrame = m_currentSampleFrame, protectedThis = WTFMove(protectedThis)] {
             m_startedRendering = false;
             switch (result) {
@@ -114 +115 @@
                 break;
             }
-            deref();
         });
     }, ThreadType::Audio);

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -5035 +5035 @@
 #if ENABLE(WEB_AUDIO)
     if (m_audioSourceNode && audioSourceProvider()) {
-        m_audioSourceNode->lock();
+        auto locker = holdLock(m_audioSourceNode->processLock());
         audioSourceProvider()->setClient(m_audioSourceNode);
-        m_audioSourceNode->unlock();
     }
 #endif
@@ -6584 +6583 @@
 
 #if ENABLE(WEB_AUDIO)
-    if (m_audioSourceNode)
-        m_audioSourceNode->lock();
+    auto protectedAudioSourceNode = makeRefPtr(m_audioSourceNode);
+    Locker<Lock> audioSourceNodeLocker(m_audioSourceNode ? &m_audioSourceNode->processLock() : nullptr);
 #endif
 
@@ -6610 +6609 @@
         if (audioSourceProvider())
             audioSourceProvider()->setClient(m_audioSourceNode);
-
-        m_audioSourceNode->unlock();
     }
 #endif