Changeset 276218 in webkit

Timestamp:

Apr 17, 2021, 8:40:56 PM (5 years ago)

Author:

Chris Dumez

Message:

Use WebProcess::existingGPUProcessConnection() whenever possible
​https://bugs.webkit.org/show_bug.cgi?id=224725

Reviewed by Darin Adler.

Use WebProcess::existingGPUProcessConnection() whenever possible, instead of WebProcess::ensureGPUProcessConnection().
This avoids relaunching the GPUProcess if it has already exited.

• WebProcess/GPU/media/RemoteAudioHardwareListener.cpp:

(WebKit::RemoteAudioHardwareListener::~RemoteAudioHardwareListener):

• WebProcess/GPU/webrtc/AudioMediaStreamTrackRenderer.cpp:

(WebKit::AudioMediaStreamTrackRenderer::~AudioMediaStreamTrackRenderer):

• WebProcess/cocoa/RemoteRealtimeAudioSource.cpp:

(WebKit::RemoteRealtimeAudioSource::~RemoteRealtimeAudioSource):

• WebProcess/cocoa/RemoteRealtimeVideoSource.cpp:

(WebKit::RemoteRealtimeVideoSource::~RemoteRealtimeVideoSource):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/GPU/media/RemoteAudioHardwareListener.cpp (modified) (1 diff)
• WebProcess/GPU/webrtc/AudioMediaStreamTrackRenderer.cpp (modified) (1 diff)
• WebProcess/cocoa/RemoteRealtimeAudioSource.cpp (modified) (1 diff)
• WebProcess/cocoa/RemoteRealtimeVideoSource.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-04-17  Chris Dumez  <cdumez@apple.com>
+
+        Use WebProcess::existingGPUProcessConnection() whenever possible
+        https://bugs.webkit.org/show_bug.cgi?id=224725
+
+        Reviewed by Darin Adler.
+
+        Use WebProcess::existingGPUProcessConnection() whenever possible, instead of WebProcess::ensureGPUProcessConnection().
+        This avoids relaunching the GPUProcess if it has already exited.
+
+        * WebProcess/GPU/media/RemoteAudioHardwareListener.cpp:
+        (WebKit::RemoteAudioHardwareListener::~RemoteAudioHardwareListener):
+        * WebProcess/GPU/webrtc/AudioMediaStreamTrackRenderer.cpp:
+        (WebKit::AudioMediaStreamTrackRenderer::~AudioMediaStreamTrackRenderer):
+        * WebProcess/cocoa/RemoteRealtimeAudioSource.cpp:
+        (WebKit::RemoteRealtimeAudioSource::~RemoteRealtimeAudioSource):
+        * WebProcess/cocoa/RemoteRealtimeVideoSource.cpp:
+        (WebKit::RemoteRealtimeVideoSource::~RemoteRealtimeVideoSource):
+
 2021-04-17  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/WebProcess/GPU/media/RemoteAudioHardwareListener.cpp

@@ -56 +56 @@
 RemoteAudioHardwareListener::~RemoteAudioHardwareListener()
 {
-    auto& connection = WebProcess::singleton().ensureGPUProcessConnection();
-    connection.messageReceiverMap().removeMessageReceiver(*this);
-    connection.connection().send(Messages::GPUConnectionToWebProcess::ReleaseAudioHardwareListener(m_identifier), 0);
+    if (auto* connection = WebProcess::singleton().existingGPUProcessConnection()) {
+        connection->messageReceiverMap().removeMessageReceiver(*this);
+        connection->connection().send(Messages::GPUConnectionToWebProcess::ReleaseAudioHardwareListener(m_identifier), 0);
+    }
 }
 

trunk/Source/WebKit/WebProcess/GPU/webrtc/AudioMediaStreamTrackRenderer.cpp

@@ -54 +54 @@
 AudioMediaStreamTrackRenderer::~AudioMediaStreamTrackRenderer()
 {
-    WebProcess::singleton().ensureGPUProcessConnection().removeClient(*this);
+    if (auto* connection = WebProcess::singleton().existingGPUProcessConnection())
+        connection->removeClient(*this);
     m_connection->send(Messages::RemoteAudioMediaStreamTrackRendererManager::ReleaseRenderer { m_identifier }, 0);
 }

trunk/Source/WebKit/WebProcess/cocoa/RemoteRealtimeAudioSource.cpp

@@ -85 +85 @@
 RemoteRealtimeAudioSource::~RemoteRealtimeAudioSource()
 {
-    if (m_proxy.shouldCaptureInGPUProcess())
-        WebProcess::singleton().ensureGPUProcessConnection().removeClient(*this);
+    if (m_proxy.shouldCaptureInGPUProcess()) {
+        if (auto* connection = WebProcess::singleton().existingGPUProcessConnection())
+            connection->removeClient(*this);
+    }
 
 #if PLATFORM(IOS_FAMILY)

trunk/Source/WebKit/WebProcess/cocoa/RemoteRealtimeVideoSource.cpp

@@ -90 +90 @@
 RemoteRealtimeVideoSource::~RemoteRealtimeVideoSource()
 {
-    if (m_proxy.shouldCaptureInGPUProcess())
-        WebProcess::singleton().ensureGPUProcessConnection().removeClient(*this);
+    if (m_proxy.shouldCaptureInGPUProcess()) {
+        if (auto* connection = WebProcess::singleton().existingGPUProcessConnection())
+            connection->removeClient(*this);
+    }
 
 #if PLATFORM(IOS_FAMILY)