[Cocoa] Make WebContextMenuProxy::copySubjectResult return a RetainPtr

https://bugs.webkit.org/show_bug.cgi?id=263567 Reviewed by Tim Horton. Clarify the ownership model around this method by returning a `RetainPtr`, and additionally rename the method so that it doesn't read like it copies the result. * Source/WebKit/UIProcess/WebContextMenuProxy.h: (WebKit::WebContextMenuProxy::imageForCopySubject const): (WebKit::WebContextMenuProxy::copySubjectResult const): Deleted. * Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.h: * Source/WebKit/UIProcess/mac/WebPageProxyMac.mm: (WebKit::WebPageProxy::handleContextMenuCopySubject): Canonical link: https://commits.webkit.org/269695@main
WebKit · Oct 24, 2023 · 21a5d7f · 21a5d7f
1 parent 728c252
commit 21a5d7f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Source/WebKit/UIProcess/WebContextMenuProxy.h b/Source/WebKit/UIProcess/WebContextMenuProxy.h
@@ -55,7 +55,7 @@ class WebContextMenuProxy : public RefCounted<WebContextMenuProxy>, public WebCo
 #endif // PLATFORM(COCOA)
 
 #if ENABLE(IMAGE_ANALYSIS_ENHANCEMENTS)
-    virtual CGImageRef copySubjectResult() const { return nullptr; }
+    virtual RetainPtr<CGImageRef> imageForCopySubject() const { return { }; }
 #endif
 
 protected:

diff --git a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.h b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.h
@@ -59,7 +59,7 @@ class WebContextMenuProxyMac final : public WebContextMenuProxy {
     NSWindow *window() const;
 
 #if ENABLE(IMAGE_ANALYSIS_ENHANCEMENTS)
-    CGImageRef copySubjectResult() const final { return m_copySubjectResult.get(); }
+    RetainPtr<CGImageRef> imageForCopySubject() const final { return m_copySubjectResult; }
 #endif
 
 private:

diff --git a/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm b/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm
@@ -808,7 +808,7 @@ static inline bool expectsLegacyImplicitRubberBandControl()
     if (!m_activeContextMenu)
         return;
 
-    RetainPtr image = m_activeContextMenu->copySubjectResult();
+    auto image = m_activeContextMenu->imageForCopySubject();
     if (!image)
         return;