Address safer CPP failures in WebPopupMenuProxyMac.h

https://bugs.webkit.org/show_bug.cgi?id=290270

Reviewed by Geoffrey Garen.

* Source/WebKit/SaferCPPExpectations/NoUnretainedMemberCheckerExpectations:
* Source/WebKit/UIProcess/mac/WebPopupMenuProxyMac.h:
* Source/WebKit/UIProcess/mac/WebPopupMenuProxyMac.mm:
(WebKit::WebPopupMenuProxyMac::showPopupMenu):

Canonical link: https://commits.webkit.org/292562@main

Author: cdumez

Source/WebKit/SaferCPPExpectations/NoUnretainedMemberCheckerExpectations

@@ -1,7 +1,6 @@
 UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm
 UIProcess/DisplayLink.h
 UIProcess/mac/PageClientImplMac.h
-UIProcess/mac/WebPopupMenuProxyMac.h
 UIProcess/mac/WebViewImpl.h
 WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm
 WebProcess/InjectedBundle/InjectedBundle.h

Source/WebKit/UIProcess/mac/WebPopupMenuProxyMac.h

@@ -30,6 +30,7 @@
 
 #include "WebPopupMenuProxy.h"
 #include <wtf/RetainPtr.h>
+#include <wtf/WeakObjCPtr.h>
 
 OBJC_CLASS NSPopUpButtonCell;
 OBJC_CLASS WKView;
@@ -56,7 +57,7 @@ class WebPopupMenuProxyMac : public WebPopupMenuProxy {
     void populate(const Vector<WebPopupItem>&, NSFont *, WebCore::TextDirection);
 
     RetainPtr<NSPopUpButtonCell> m_popup;
-    NSView *m_webView;
+    WeakObjCPtr<NSView> m_webView;
     bool m_wasCanceled;
 };
 

Source/WebKit/UIProcess/mac/WebPopupMenuProxyMac.mm

@@ -121,7 +121,7 @@
 
     populate(items, font, textDirection);
 
-    [m_popup attachPopUpWithFrame:rect inView:m_webView];
+    [m_popup attachPopUpWithFrame:rect inView:m_webView.get().get()];
     [m_popup selectItemAtIndex:selectedIndex];
     [m_popup setUserInterfaceLayoutDirection:textDirection == TextDirection::LTR ? NSUserInterfaceLayoutDirectionLeftToRight : NSUserInterfaceLayoutDirectionRightToLeft];
 
@@ -154,7 +154,7 @@
     RetainPtr<NSView> dummyView = adoptNS([[NSView alloc] initWithFrame:rect]);
     [dummyView.get() setUserInterfaceLayoutDirection:textDirection == TextDirection::LTR ? NSUserInterfaceLayoutDirectionLeftToRight : NSUserInterfaceLayoutDirectionRightToLeft];
     [m_webView addSubview:dummyView.get()];
-    location = [dummyView convertPoint:location fromView:m_webView];
+    location = [dummyView convertPoint:location fromView:m_webView.get().get()];
 
     NSControlSize controlSize;
     switch (data.menuSize) {