Deploy more smart pointers in Source/WebKit/UIProcess/Extensions

https://bugs.webkit.org/show_bug.cgi?id=260845 Reviewed by Brian Weinstein. Deployed more smart pointers. * Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionContextCocoa.mm: (WebKit::WebExtensionContext::removePermissionMatchPatterns): (WebKit::WebExtensionContext::addInjectedContent): * Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionControllerCocoa.mm: (WebKit::WebExtensionController::addPage): (WebKit::WebExtensionController::removePage): * Source/WebKit/UIProcess/Extensions/WebExtensionContext.cpp: (WebKit::WebExtensionContext::processes const): Canonical link: https://commits.webkit.org/267429@main
WebKit · Aug 29, 2023 · 787859b · 787859b
1 parent d6f0fed
commit 787859b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionContextCocoa.mm b/Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionContextCocoa.mm
@@ -680,8 +680,9 @@ static _WKWebExtensionContextError toAPI(WebExtensionContext::Error error)
         }
 
         for (auto& patternToRemove : matchPatternsToRemove) {
-            if (patternToRemove->matchesPattern(entry.key, WebExtensionMatchPattern::Options::IgnorePaths)) {
-                removedMatchPatterns.add(entry.key);
+            Ref pattern = entry.key;
+            if (patternToRemove->matchesPattern(pattern, WebExtensionMatchPattern::Options::IgnorePaths)) {
+                removedMatchPatterns.add(pattern);
                 return true;
             }
         }
@@ -1926,7 +1927,7 @@ static _WKWebExtensionContextError toAPI(WebExtensionContext::Error error)
         auto injectedFrames = injectedContentData.injectsIntoAllFrames ? WebCore::UserContentInjectedFrames::InjectInAllFrames : WebCore::UserContentInjectedFrames::InjectInTopFrameOnly;
         auto injectionTime = toImpl(injectedContentData.injectionTime);
         auto waitForNotification = WebCore::WaitForNotificationBeforeInjecting::No;
-        auto& executionWorld = injectedContentData.forMainWorld ? API::ContentWorld::pageContentWorld() : *m_contentScriptWorld;
+        Ref executionWorld = injectedContentData.forMainWorld ? API::ContentWorld::pageContentWorld() : *m_contentScriptWorld;
 
         for (NSString *scriptPath in injectedContentData.scriptPaths.get()) {
             NSString *scriptString = m_extension->resourceStringForPath(scriptPath, WebExtension::CacheResult::Yes);

diff --git a/Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionControllerCocoa.mm b/Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionControllerCocoa.mm
@@ -154,17 +154,21 @@
     for (auto& entry : m_registeredSchemeHandlers)
         page.setURLSchemeHandlerForScheme(entry.value.copyRef(), entry.key);
 
-    addProcessPool(page.process().processPool());
-    addUserContentController(page.userContentController());
+    Ref pool = page.process().processPool();
+    addProcessPool(pool);
+    Ref controller = page.userContentController();
+    addUserContentController(controller);
 }
 
 void WebExtensionController::removePage(WebPageProxy& page)
 {
     ASSERT(m_pages.contains(page));
     m_pages.remove(page);
 
-    removeProcessPool(page.process().processPool());
-    removeUserContentController(page.userContentController());
+    Ref pool = page.process().processPool();
+    removeProcessPool(pool);
+    Ref controller = page.userContentController();
+    removeUserContentController(controller);
 }
 
 void WebExtensionController::addProcessPool(WebProcessPool& processPool)

diff --git a/Source/WebKit/UIProcess/Extensions/WebExtensionContext.cpp b/Source/WebKit/UIProcess/Extensions/WebExtensionContext.cpp
@@ -75,8 +75,8 @@ WeakHashSet<WebProcessProxy> WebExtensionContext::processes(WebExtensionEventLis
     auto page = m_eventListenerPages.find(type);
     if (page != m_eventListenerPages.end()) {
         for (auto entry : page->value) {
-            auto& process = entry.key.process();
-            if (process.canSendMessage())
+            Ref process = entry.key.process();
+            if (process->canSendMessage())
                 processes.add(process);
         }
     }