From 943a8749802f4da7e8744e51c5758020b6c6a094 Mon Sep 17 00:00:00 2001
From: Ryosuke Niwa <rniwa@webkit.org>
Date: Wed, 16 Aug 2023 12:56:40 -0700
Subject: [PATCH] Deploy smart pointers in PlaybackSessionManager.mm and
 RemoteCaptureSampleManager.cpp https://bugs.webkit.org/show_bug.cgi?id=260245

Reviewed by Jer Noble.

Deployed more smart pointers in these two files.

* Source/WebKit/WebProcess/cocoa/PlaybackSessionManager.mm:
(WebKit::PlaybackSessionManager::handleControlledElementIDRequest):
* Source/WebKit/WebProcess/cocoa/RemoteCaptureSampleManager.cpp:
(WebKit::RemoteCaptureSampleManager::setConnection):
(WebKit::RemoteCaptureSampleManager::addSource):
(WebKit::RemoteCaptureSampleManager::videoFrameAvailable):

Canonical link: https://commits.webkit.org/266956@main
---
 Source/WebKit/WebProcess/cocoa/PlaybackSessionManager.mm    | 3 +--
 .../WebKit/WebProcess/cocoa/RemoteCaptureSampleManager.cpp  | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Source/WebKit/WebProcess/cocoa/PlaybackSessionManager.mm b/Source/WebKit/WebProcess/cocoa/PlaybackSessionManager.mm
index a9a9121e0a0b..8dccb25d83f0 100644
--- a/Source/WebKit/WebProcess/cocoa/PlaybackSessionManager.mm
+++ b/Source/WebKit/WebProcess/cocoa/PlaybackSessionManager.mm
@@ -498,8 +498,7 @@
 
 void PlaybackSessionManager::handleControlledElementIDRequest(PlaybackSessionContextIdentifier contextId)
 {
-    auto element = ensureModel(contextId).mediaElement();
-    if (element)
+    if (RefPtr element = ensureModel(contextId).mediaElement())
         m_page->send(Messages::PlaybackSessionManagerProxy::HandleControlledElementIDResponse(contextId, element->getIdAttribute()));
 }
 
diff --git a/Source/WebKit/WebProcess/cocoa/RemoteCaptureSampleManager.cpp b/Source/WebKit/WebProcess/cocoa/RemoteCaptureSampleManager.cpp
index 6079d8a2db72..f36511655068 100644
--- a/Source/WebKit/WebProcess/cocoa/RemoteCaptureSampleManager.cpp
+++ b/Source/WebKit/WebProcess/cocoa/RemoteCaptureSampleManager.cpp
@@ -63,7 +63,7 @@ void RemoteCaptureSampleManager::setConnection(IPC::Connection* connection)
     if (m_connection == connection)
         return;
 
-    auto* parentConnection = WebProcess::singleton().parentProcessConnection();
+    RefPtr parentConnection = WebProcess::singleton().parentProcessConnection();
     if (connection == parentConnection) {
         if (!m_isRegisteredToParentProcessConnection) {
             m_isRegisteredToParentProcessConnection = true;
@@ -83,7 +83,7 @@ void RemoteCaptureSampleManager::setConnection(IPC::Connection* connection)
 void RemoteCaptureSampleManager::addSource(Ref<RemoteRealtimeAudioSource>&& source)
 {
     ASSERT(WTF::isMainRunLoop());
-    setConnection(&source->connection());
+    setConnection(Ref { source->connection() }.ptr());
 
     m_queue->dispatch([this, protectedThis = Ref { *this }, source = WTFMove(source)]() mutable {
         auto identifier = source->identifier();
@@ -147,7 +147,7 @@ void RemoteCaptureSampleManager::videoFrameAvailable(RealtimeMediaSourceIdentifi
     Ref<RemoteVideoFrameProxy> videoFrame = [&] {
         // FIXME: We need to either get GPUProcess or UIProcess object heap proxy. For now we always go to GPUProcess.
         Locker lock(m_videoFrameObjectHeapProxyLock);
-        return RemoteVideoFrameProxy::create(*m_connection, *m_videoFrameObjectHeapProxy, WTFMove(properties));
+        return RemoteVideoFrameProxy::create(Ref { *m_connection }, Ref { *m_videoFrameObjectHeapProxy }, WTFMove(properties));
     }();
     auto iterator = m_videoSources.find(identifier);
     if (iterator == m_videoSources.end()) {