Address safer CPP failures in PageClientImplMac.h

cdumez · cdumez · commit f92ac66b5bca · 2025-03-23T14:19:19.000-07:00
https://bugs.webkit.org/show_bug.cgi?id=290217 Reviewed by Geoffrey Garen. * Source/WebKit/SaferCPPExpectations/NoUnretainedMemberCheckerExpectations: * Source/WebKit/UIProcess/mac/PageClientImplMac.h: * Source/WebKit/UIProcess/mac/PageClientImplMac.mm: (WebKit::PageClientImpl::activeView const): (WebKit::PageClientImpl::activeWindow const): (WebKit::PageClientImpl::assistiveTechnologyMakeFirstResponder): (WebKit::PageClientImpl::makeFirstResponder): (WebKit::PageClientImpl::setCursor): (WebKit::PageClientImpl::screenToRootView): (WebKit::PageClientImpl::rootViewToScreen): (WebKit::PageClientImpl::createPopupMenuProxy): (WebKit::PageClientImpl::createContextMenuProxy): (WebKit::PageClientImpl::createColorPicker): (WebKit::PageClientImpl::createDataListSuggestionsDropdown): (WebKit::PageClientImpl::createDateTimePicker): (WebKit::PageClientImpl::createValidationBubble): (WebKit::PageClientImpl::didPerformDictionaryLookup): (WebKit::PageClientImpl::showCorrectionPanel): (WebKit::PageClientImpl::showDictationAlternativeUI): (WebKit::PageClientImpl::didFinishNavigation): (WebKit::PageClientImpl::didFailNavigation): (WebKit::PageClientImpl::boundsOfLayerInLayerBackedWindowCoordinates const): (WebKit::PageClientImpl::showPlatformContextMenu): (WebKit::PageClientImpl::refView): (WebKit::PageClientImpl::derefView): (WebKit::PageClientImpl::userInterfaceLayoutDirection): (WebKit::PageClientImpl::handleContextMenuWritingTools): Canonical link: https://commits.webkit.org/292568@main
diff --git a/Source/WebKit/SaferCPPExpectations/NoUnretainedMemberCheckerExpectations b/Source/WebKit/SaferCPPExpectations/NoUnretainedMemberCheckerExpectations
@@ -1 +0,0 @@
-UIProcess/mac/PageClientImplMac.h
diff --git a/Source/WebKit/UIProcess/mac/PageClientImplMac.h b/Source/WebKit/UIProcess/mac/PageClientImplMac.h
@@ -33,6 +33,7 @@
 #include <WebCore/DOMPasteAccess.h>
 #include <wtf/CompletionHandler.h>
 #include <wtf/Forward.h>
+#include <wtf/WeakObjCPtr.h>
 
 @class WKEditorUndoTarget;
 @class WKView;
@@ -327,7 +328,7 @@ class PageClientImpl final : public PageClientImplCocoa
     void didCleanupFullscreen() final { }
 #endif
 
-    NSView *m_view;
+    WeakObjCPtr<NSView> m_view;
     WeakPtr<WebViewImpl> m_impl;
 #if USE(AUTOCORRECTION_PANEL)
     CorrectionPanel m_correctionPanel;
diff --git a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm
@@ -155,7 +155,7 @@ - (BOOL)_hostsLayersInWindowServer;
 
 NSView *PageClientImpl::activeView() const
 {
-    return (m_impl && m_impl->thumbnailView()) ? (NSView *)m_impl->thumbnailView() : m_view;
+    return (m_impl && m_impl->thumbnailView()) ? (NSView *)m_impl->thumbnailView() : m_view.getAutoreleased();
 }
 
 NSWindow *PageClientImpl::activeWindow() const
@@ -164,7 +164,7 @@ - (BOOL)_hostsLayersInWindowServer;
         return [m_impl->thumbnailView() window];
     if (m_impl && m_impl->targetWindowForMovePreparation())
         return m_impl->targetWindowForMovePreparation();
-    return m_view.window;
+    return [m_view window];
 }
 
 bool PageClientImpl::isViewWindowActive()
@@ -186,15 +186,15 @@ - (BOOL)_hostsLayersInWindowServer;
 
 void PageClientImpl::assistiveTechnologyMakeFirstResponder()
 {
-    [[m_view window] makeFirstResponder:m_view];
+    [[m_view window] makeFirstResponder:m_view.get().get()];
 }
     
 void PageClientImpl::makeFirstResponder()
 {
     if (m_shouldSuppressFirstResponderChanges)
         return;
 
-    [[m_view window] makeFirstResponder:m_view];
+    [[m_view window] makeFirstResponder:m_view.get().get()];
 }
     
 bool PageClientImpl::isViewVisible()
@@ -323,10 +323,11 @@ - (BOOL)_hostsLayersInWindowServer;
     if ([NSApp _cursorRectCursor])
         return;
 
-    if (!m_view)
+    RetainPtr view = m_view.get();
+    if (!view)
         return;
 
-    NSWindow *window = [m_view window];
+    NSWindow *window = [view window];
     if (!window)
         return;
 
@@ -338,7 +339,7 @@ - (BOOL)_hostsLayersInWindowServer;
     if ([NSCursor currentCursor] == platformCursor)
         return;
 
-    if (m_impl->imageAnalysisOverlayViewHasCursorAtPoint([m_view convertPoint:mouseLocationInScreen fromView:nil]))
+    if (m_impl->imageAnalysisOverlayViewHasCursorAtPoint([view convertPoint:mouseLocationInScreen fromView:nil]))
         return;
 
     [platformCursor set];
@@ -453,20 +454,20 @@ - (BOOL)_hostsLayersInWindowServer;
     
 IntPoint PageClientImpl::screenToRootView(const IntPoint& point)
 {
-    NSPoint windowCoord = [m_view.window convertPointFromScreen:point];
+    NSPoint windowCoord = [[m_view window] convertPointFromScreen:point];
     return IntPoint([m_view convertPoint:windowCoord fromView:nil]);
 }
 
 IntPoint PageClientImpl::rootViewToScreen(const IntPoint& point)
 {
-    return IntPoint([m_view.window convertPointToScreen:[m_view convertPoint:point toView:nil]]);
+    return IntPoint([[m_view window] convertPointToScreen:[m_view convertPoint:point toView:nil]]);
 }
 
 IntRect PageClientImpl::rootViewToScreen(const IntRect& rect)
 {
     NSRect tempRect = rect;
     tempRect = [m_view convertRect:tempRect toView:nil];
-    tempRect.origin = [m_view.window convertPointToScreen:tempRect.origin];
+    tempRect.origin = [[m_view window] convertPointToScreen:tempRect.origin];
     return enclosingIntRect(tempRect);
 }
 
@@ -508,14 +509,14 @@ - (BOOL)_hostsLayersInWindowServer;
 
 RefPtr<WebPopupMenuProxy> PageClientImpl::createPopupMenuProxy(WebPageProxy& page)
 {
-    return WebPopupMenuProxyMac::create(m_view, page.popupMenuClient());
+    return WebPopupMenuProxyMac::create(m_view.get().get(), page.popupMenuClient());
 }
 
 #if ENABLE(CONTEXT_MENUS)
 
 Ref<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy& page, FrameInfoData&& frameInfo, ContextMenuContextData&& context, const UserData& userData)
 {
-    return WebContextMenuProxyMac::create(m_view, page, WTFMove(frameInfo), WTFMove(context), userData);
+    return WebContextMenuProxyMac::create(m_view.get().get(), page, WTFMove(frameInfo), WTFMove(context), userData);
 }
 
 void PageClientImpl::didShowContextMenu()
@@ -532,22 +533,22 @@ - (BOOL)_hostsLayersInWindowServer;
 
 RefPtr<WebColorPicker> PageClientImpl::createColorPicker(WebPageProxy& page, const WebCore::Color& initialColor, const WebCore::IntRect& rect, ColorControlSupportsAlpha supportsAlpha, Vector<WebCore::Color>&& suggestions)
 {
-    return WebColorPickerMac::create(&page.colorPickerClient(), initialColor, rect, supportsAlpha, WTFMove(suggestions), m_view);
+    return WebColorPickerMac::create(&page.colorPickerClient(), initialColor, rect, supportsAlpha, WTFMove(suggestions), m_view.get().get());
 }
 
 RefPtr<WebDataListSuggestionsDropdown> PageClientImpl::createDataListSuggestionsDropdown(WebPageProxy& page)
 {
-    return WebDataListSuggestionsDropdownMac::create(page, m_view);
+    return WebDataListSuggestionsDropdownMac::create(page, m_view.get().get());
 }
 
 RefPtr<WebDateTimePicker> PageClientImpl::createDateTimePicker(WebPageProxy& page)
 {
-    return WebDateTimePickerMac::create(page, m_view);
+    return WebDateTimePickerMac::create(page, m_view.get().get());
 }
 
 Ref<ValidationBubble> PageClientImpl::createValidationBubble(const String& message, const ValidationBubble::Settings& settings)
 {
-    return ValidationBubble::create(m_view, message, settings);
+    return ValidationBubble::create(m_view.get().get(), message, settings);
 }
 
 void PageClientImpl::showBrowsingWarning(const BrowsingWarning& warning, CompletionHandler<void(std::variant<WebKit::ContinueUnsafeLoad, URL>&&)>&& completionHandler)
@@ -693,7 +694,7 @@ - (BOOL)_hostsLayersInWindowServer;
 {
     m_impl->prepareForDictionaryLookup();
 
-    DictionaryLookup::showPopup(dictionaryPopupInfo, m_view, [this](TextIndicator& textIndicator) {
+    DictionaryLookup::showPopup(dictionaryPopupInfo, m_view.get().get(), [this](TextIndicator& textIndicator) {
         m_impl->setTextIndicator(textIndicator, WebCore::TextIndicatorLifetime::Permanent);
     }, nullptr, [this]() {
         m_impl->clearTextIndicatorWithAnimation(WebCore::TextIndicatorDismissalAnimation::None);
@@ -705,7 +706,7 @@ - (BOOL)_hostsLayersInWindowServer;
 #if USE(AUTOCORRECTION_PANEL)
     if (!isViewVisible() || !isViewInWindow())
         return;
-    m_correctionPanel.show(m_view, *m_impl, type, boundingBoxOfReplacedString, replacedString, replacementString, alternativeReplacementStrings);
+    m_correctionPanel.show(m_view.get().get(), *m_impl, type, boundingBoxOfReplacedString, replacedString, replacementString, alternativeReplacementStrings);
 #endif
 }
 
@@ -771,7 +772,7 @@ static inline NSCorrectionResponse toCorrectionResponse(AutocorrectionResponse r
 {
     if (!isViewVisible() || !isViewInWindow())
         return;
-    m_alternativeTextUIController->showAlternatives(m_view, boundingBoxOfDictatedText, dictationContext, ^(NSString *acceptedAlternative) {
+    m_alternativeTextUIController->showAlternatives(m_view.get().get(), boundingBoxOfDictatedText, dictationContext, ^(NSString *acceptedAlternative) {
         m_impl->handleAcceptedAlternativeText(acceptedAlternative);
     });
 }
@@ -921,15 +922,15 @@ static inline NSCorrectionResponse toCorrectionResponse(AutocorrectionResponse r
     if (RefPtr gestureController = m_impl->gestureController())
         gestureController->didFinishNavigation(navigation);
 
-    NSAccessibilityPostNotification(NSAccessibilityUnignoredAncestor(m_view), kAXLoadCompleteNotification);
+    NSAccessibilityPostNotification(NSAccessibilityUnignoredAncestor(m_view.get().get()), kAXLoadCompleteNotification);
 }
 
 void PageClientImpl::didFailNavigation(API::Navigation* navigation)
 {
     if (RefPtr gestureController = m_impl->gestureController())
         gestureController->didFailNavigation(navigation);
 
-    NSAccessibilityPostNotification(NSAccessibilityUnignoredAncestor(m_view), kAXLoadCompleteNotification);
+    NSAccessibilityPostNotification(NSAccessibilityUnignoredAncestor(m_view.get().get()), kAXLoadCompleteNotification);
 }
 
 void PageClientImpl::didSameDocumentNavigationForMainFrame(SameDocumentNavigationType type)
@@ -950,7 +951,7 @@ static inline NSCorrectionResponse toCorrectionResponse(AutocorrectionResponse r
 
 CGRect PageClientImpl::boundsOfLayerInLayerBackedWindowCoordinates(CALayer *layer) const
 {
-    CALayer *windowContentLayer = static_cast<NSView *>(m_view.window.contentView).layer;
+    CALayer *windowContentLayer = static_cast<NSView *>([m_view window].contentView).layer;
     ASSERT(windowContentLayer);
 
     return [windowContentLayer convertRect:layer.bounds fromLayer:layer];
@@ -974,7 +975,7 @@ static inline NSCorrectionResponse toCorrectionResponse(AutocorrectionResponse r
 
 void PageClientImpl::showPlatformContextMenu(NSMenu *menu, IntPoint location)
 {
-    [menu popUpMenuPositioningItem:nil atLocation:location inView:m_view];
+    [menu popUpMenuPositioningItem:nil atLocation:location inView:m_view.get().get()];
 }
 
 #if ENABLE(WIRELESS_PLAYBACK_TARGET)
@@ -986,12 +987,14 @@ static inline NSCorrectionResponse toCorrectionResponse(AutocorrectionResponse r
 
 void PageClientImpl::refView()
 {
-    CFRetain((__bridge CFTypeRef)m_view);
+    if (RetainPtr view = m_view.get())
+        CFRetain((__bridge CFTypeRef)view.get());
 }
 
 void PageClientImpl::derefView()
 {
-    CFRelease((__bridge CFTypeRef)m_view);
+    if (RetainPtr view = m_view.get())
+        CFRelease((__bridge CFTypeRef)view.get());
 }
 
 void PageClientImpl::startWindowDrag()
@@ -1053,9 +1056,10 @@ static inline NSCorrectionResponse toCorrectionResponse(AutocorrectionResponse r
 
 WebCore::UserInterfaceLayoutDirection PageClientImpl::userInterfaceLayoutDirection()
 {
-    if (!m_view)
+    RetainPtr view = m_view.get();
+    if (!view)
         return WebCore::UserInterfaceLayoutDirection::LTR;
-    return (m_view.userInterfaceLayoutDirection == NSUserInterfaceLayoutDirectionLeftToRight) ? WebCore::UserInterfaceLayoutDirection::LTR : WebCore::UserInterfaceLayoutDirection::RTL;
+    return ([view userInterfaceLayoutDirection] == NSUserInterfaceLayoutDirectionLeftToRight) ? WebCore::UserInterfaceLayoutDirection::LTR : WebCore::UserInterfaceLayoutDirection::RTL;
 }
 
 bool PageClientImpl::effectiveAppearanceIsDark() const
@@ -1143,7 +1147,7 @@ static inline NSCorrectionResponse toCorrectionResponse(AutocorrectionResponse r
 {
     RetainPtr webView = this->webView();
 ALLOW_DEPRECATED_DECLARATIONS_BEGIN
-    [[PAL::getWTWritingToolsClass() sharedInstance] showTool:WebKit::convertToPlatformRequestedTool(tool) forSelectionRect:selectionRect ofView:m_view forDelegate:webView.get()];
+    [[PAL::getWTWritingToolsClass() sharedInstance] showTool:WebKit::convertToPlatformRequestedTool(tool) forSelectionRect:selectionRect ofView:m_view.get().get() forDelegate:webView.get()];
 ALLOW_DEPRECATED_DECLARATIONS_END
 }
 
diff --git a/Source/WebKit/UIProcess/mac/WebDataListSuggestionsDropdownMac.h b/Source/WebKit/UIProcess/mac/WebDataListSuggestionsDropdownMac.h
@@ -29,6 +29,7 @@
 
 #import "WebDataListSuggestionsDropdown.h"
 #import <wtf/RetainPtr.h>
+#import <wtf/WeakObjCPtr.h>
 
 OBJC_CLASS WKDataListSuggestionsController;
 
@@ -50,7 +51,7 @@ class WebDataListSuggestionsDropdownMac final : public WebDataListSuggestionsDro
 
     void selectOption();
 
-    NSView *m_view;
+    WeakObjCPtr<NSView> m_view;
     RetainPtr<WKDataListSuggestionsController> m_dropdownUI;
 };
 
diff --git a/Source/WebKit/UIProcess/mac/WebDataListSuggestionsDropdownMac.mm b/Source/WebKit/UIProcess/mac/WebDataListSuggestionsDropdownMac.mm
@@ -88,7 +88,7 @@ - (String)currentSelectedString;
         return;
     }
 
-    m_dropdownUI = adoptNS([[WKDataListSuggestionsController alloc] initWithInformation:WTFMove(information) inView:m_view]);
+    m_dropdownUI = adoptNS([[WKDataListSuggestionsController alloc] initWithInformation:WTFMove(information) inView:m_view.get().get()]);
     [m_dropdownUI showSuggestionsDropdown:*this];
 }
 

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ - (BOOL)_hostsLayersInWindowServer;`
`155`	`155`
`156`	`156`	`NSView *PageClientImpl::activeView() const`
`157`	`157`	`{`
`158`		`- return (m_impl && m_impl->thumbnailView()) ? (NSView *)m_impl->thumbnailView() : m_view;`
	`158`	`+ return (m_impl && m_impl->thumbnailView()) ? (NSView *)m_impl->thumbnailView() : m_view.getAutoreleased();`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`NSWindow *PageClientImpl::activeWindow() const`
`@@ -164,7 +164,7 @@ - (BOOL)_hostsLayersInWindowServer;`
`164`	`164`	`return [m_impl->thumbnailView() window];`
`165`	`165`	`if (m_impl && m_impl->targetWindowForMovePreparation())`
`166`	`166`	`return m_impl->targetWindowForMovePreparation();`
`167`		`- return m_view.window;`
	`167`	`+ return [m_view window];`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`bool PageClientImpl::isViewWindowActive()`
`@@ -186,15 +186,15 @@ - (BOOL)_hostsLayersInWindowServer;`
`186`	`186`
`187`	`187`	`void PageClientImpl::assistiveTechnologyMakeFirstResponder()`
`188`	`188`	`{`
`189`		`- [[m_view window] makeFirstResponder:m_view];`
	`189`	`+ [[m_view window] makeFirstResponder:m_view.get().get()];`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`void PageClientImpl::makeFirstResponder()`
`193`	`193`	`{`
`194`	`194`	`if (m_shouldSuppressFirstResponderChanges)`
`195`	`195`	`return;`
`196`	`196`
`197`		`- [[m_view window] makeFirstResponder:m_view];`
	`197`	`+ [[m_view window] makeFirstResponder:m_view.get().get()];`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`bool PageClientImpl::isViewVisible()`
`@@ -323,10 +323,11 @@ - (BOOL)_hostsLayersInWindowServer;`
`323`	`323`	`if ([NSApp _cursorRectCursor])`
`324`	`324`	`return;`
`325`	`325`
`326`		`- if (!m_view)`
	`326`	`+ RetainPtr view = m_view.get();`
	`327`	`+ if (!view)`
`327`	`328`	`return;`
`328`	`329`
`329`		`- NSWindow *window = [m_view window];`
	`330`	`+ NSWindow *window = [view window];`
`330`	`331`	`if (!window)`
`331`	`332`	`return;`
`332`	`333`
`@@ -338,7 +339,7 @@ - (BOOL)_hostsLayersInWindowServer;`
`338`	`339`	`if ([NSCursor currentCursor] == platformCursor)`
`339`	`340`	`return;`
`340`	`341`
`341`		`- if (m_impl->imageAnalysisOverlayViewHasCursorAtPoint([m_view convertPoint:mouseLocationInScreen fromView:nil]))`
	`342`	`+ if (m_impl->imageAnalysisOverlayViewHasCursorAtPoint([view convertPoint:mouseLocationInScreen fromView:nil]))`
`342`	`343`	`return;`
`343`	`344`
`344`	`345`	`[platformCursor set];`
`@@ -453,20 +454,20 @@ - (BOOL)_hostsLayersInWindowServer;`
`453`	`454`
`454`	`455`	`IntPoint PageClientImpl::screenToRootView(const IntPoint& point)`
`455`	`456`	`{`
`456`		`- NSPoint windowCoord = [m_view.window convertPointFromScreen:point];`
	`457`	`+ NSPoint windowCoord = [[m_view window] convertPointFromScreen:point];`
`457`	`458`	`return IntPoint([m_view convertPoint:windowCoord fromView:nil]);`
`458`	`459`	`}`
`459`	`460`
`460`	`461`	`IntPoint PageClientImpl::rootViewToScreen(const IntPoint& point)`
`461`	`462`	`{`
`462`		`- return IntPoint([m_view.window convertPointToScreen:[m_view convertPoint:point toView:nil]]);`
	`463`	`+ return IntPoint([[m_view window] convertPointToScreen:[m_view convertPoint:point toView:nil]]);`
`463`	`464`	`}`
`464`	`465`
`465`	`466`	`IntRect PageClientImpl::rootViewToScreen(const IntRect& rect)`
`466`	`467`	`{`
`467`	`468`	`NSRect tempRect = rect;`
`468`	`469`	`tempRect = [m_view convertRect:tempRect toView:nil];`
`469`		`- tempRect.origin = [m_view.window convertPointToScreen:tempRect.origin];`
	`470`	`+ tempRect.origin = [[m_view window] convertPointToScreen:tempRect.origin];`
`470`	`471`	`return enclosingIntRect(tempRect);`
`471`	`472`	`}`
`472`	`473`
`@@ -508,14 +509,14 @@ - (BOOL)_hostsLayersInWindowServer;`
`508`	`509`
`509`	`510`	`RefPtr<WebPopupMenuProxy> PageClientImpl::createPopupMenuProxy(WebPageProxy& page)`
`510`	`511`	`{`
`511`		`- return WebPopupMenuProxyMac::create(m_view, page.popupMenuClient());`
	`512`	`+ return WebPopupMenuProxyMac::create(m_view.get().get(), page.popupMenuClient());`
`512`	`513`	`}`
`513`	`514`
`514`	`515`	`#if ENABLE(CONTEXT_MENUS)`
`515`	`516`
`516`	`517`	`Ref<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy& page, FrameInfoData&& frameInfo, ContextMenuContextData&& context, const UserData& userData)`
`517`	`518`	`{`
`518`		`- return WebContextMenuProxyMac::create(m_view, page, WTFMove(frameInfo), WTFMove(context), userData);`
	`519`	`+ return WebContextMenuProxyMac::create(m_view.get().get(), page, WTFMove(frameInfo), WTFMove(context), userData);`
`519`	`520`	`}`
`520`	`521`
`521`	`522`	`void PageClientImpl::didShowContextMenu()`
`@@ -532,22 +533,22 @@ - (BOOL)_hostsLayersInWindowServer;`
`532`	`533`
`533`	`534`	`RefPtr<WebColorPicker> PageClientImpl::createColorPicker(WebPageProxy& page, const WebCore::Color& initialColor, const WebCore::IntRect& rect, ColorControlSupportsAlpha supportsAlpha, Vector<WebCore::Color>&& suggestions)`
`534`	`535`	`{`
`535`		`- return WebColorPickerMac::create(&page.colorPickerClient(), initialColor, rect, supportsAlpha, WTFMove(suggestions), m_view);`
	`536`	`+ return WebColorPickerMac::create(&page.colorPickerClient(), initialColor, rect, supportsAlpha, WTFMove(suggestions), m_view.get().get());`
`536`	`537`	`}`
`537`	`538`
`538`	`539`	`RefPtr<WebDataListSuggestionsDropdown> PageClientImpl::createDataListSuggestionsDropdown(WebPageProxy& page)`
`539`	`540`	`{`
`540`		`- return WebDataListSuggestionsDropdownMac::create(page, m_view);`
	`541`	`+ return WebDataListSuggestionsDropdownMac::create(page, m_view.get().get());`
`541`	`542`	`}`
`542`	`543`
`543`	`544`	`RefPtr<WebDateTimePicker> PageClientImpl::createDateTimePicker(WebPageProxy& page)`
`544`	`545`	`{`
`545`		`- return WebDateTimePickerMac::create(page, m_view);`
	`546`	`+ return WebDateTimePickerMac::create(page, m_view.get().get());`
`546`	`547`	`}`
`547`	`548`
`548`	`549`	`Ref<ValidationBubble> PageClientImpl::createValidationBubble(const String& message, const ValidationBubble::Settings& settings)`
`549`	`550`	`{`
`550`		`- return ValidationBubble::create(m_view, message, settings);`
	`551`	`+ return ValidationBubble::create(m_view.get().get(), message, settings);`
`551`	`552`	`}`
`552`	`553`
`553`	`554`	`void PageClientImpl::showBrowsingWarning(const BrowsingWarning& warning, CompletionHandler<void(std::variant<WebKit::ContinueUnsafeLoad, URL>&&)>&& completionHandler)`
`@@ -693,7 +694,7 @@ - (BOOL)_hostsLayersInWindowServer;`
`693`	`694`	`{`
`694`	`695`	`m_impl->prepareForDictionaryLookup();`
`695`	`696`
`696`		`- DictionaryLookup::showPopup(dictionaryPopupInfo, m_view, [this](TextIndicator& textIndicator) {`
	`697`	`+ DictionaryLookup::showPopup(dictionaryPopupInfo, m_view.get().get(), [this](TextIndicator& textIndicator) {`
`697`	`698`	`m_impl->setTextIndicator(textIndicator, WebCore::TextIndicatorLifetime::Permanent);`
`698`	`699`	`}, nullptr, [this]() {`
`699`	`700`	`m_impl->clearTextIndicatorWithAnimation(WebCore::TextIndicatorDismissalAnimation::None);`
`@@ -705,7 +706,7 @@ - (BOOL)_hostsLayersInWindowServer;`
`705`	`706`	`#if USE(AUTOCORRECTION_PANEL)`
`706`	`707`	`if (!isViewVisible() \|\| !isViewInWindow())`
`707`	`708`	`return;`
`708`		`- m_correctionPanel.show(m_view, *m_impl, type, boundingBoxOfReplacedString, replacedString, replacementString, alternativeReplacementStrings);`
	`709`	`+ m_correctionPanel.show(m_view.get().get(), *m_impl, type, boundingBoxOfReplacedString, replacedString, replacementString, alternativeReplacementStrings);`
`709`	`710`	`#endif`
`710`	`711`	`}`
`711`	`712`
`@@ -771,7 +772,7 @@ static inline NSCorrectionResponse toCorrectionResponse(AutocorrectionResponse r`
`771`	`772`	`{`
`772`	`773`	`if (!isViewVisible() \|\| !isViewInWindow())`
`773`	`774`	`return;`
`774`		`- m_alternativeTextUIController->showAlternatives(m_view, boundingBoxOfDictatedText, dictationContext, ^(NSString *acceptedAlternative) {`
	`775`	`+ m_alternativeTextUIController->showAlternatives(m_view.get().get(), boundingBoxOfDictatedText, dictationContext, ^(NSString *acceptedAlternative) {`
`775`	`776`	`m_impl->handleAcceptedAlternativeText(acceptedAlternative);`
`776`	`777`	`});`
`777`	`778`	`}`
`@@ -921,15 +922,15 @@ static inline NSCorrectionResponse toCorrectionResponse(AutocorrectionResponse r`
`921`	`922`	`if (RefPtr gestureController = m_impl->gestureController())`
`922`	`923`	`gestureController->didFinishNavigation(navigation);`
`923`	`924`
`924`		`- NSAccessibilityPostNotification(NSAccessibilityUnignoredAncestor(m_view), kAXLoadCompleteNotification);`
	`925`	`+ NSAccessibilityPostNotification(NSAccessibilityUnignoredAncestor(m_view.get().get()), kAXLoadCompleteNotification);`
`925`	`926`	`}`
`926`	`927`
`927`	`928`	`void PageClientImpl::didFailNavigation(API::Navigation* navigation)`
`928`	`929`	`{`
`929`	`930`	`if (RefPtr gestureController = m_impl->gestureController())`
`930`	`931`	`gestureController->didFailNavigation(navigation);`
`931`	`932`
`932`		`- NSAccessibilityPostNotification(NSAccessibilityUnignoredAncestor(m_view), kAXLoadCompleteNotification);`
	`933`	`+ NSAccessibilityPostNotification(NSAccessibilityUnignoredAncestor(m_view.get().get()), kAXLoadCompleteNotification);`
`933`	`934`	`}`
`934`	`935`
`935`	`936`	`void PageClientImpl::didSameDocumentNavigationForMainFrame(SameDocumentNavigationType type)`
`@@ -950,7 +951,7 @@ static inline NSCorrectionResponse toCorrectionResponse(AutocorrectionResponse r`
`950`	`951`
`951`	`952`	`CGRect PageClientImpl::boundsOfLayerInLayerBackedWindowCoordinates(CALayer *layer) const`
`952`	`953`	`{`
`953`		`- CALayer windowContentLayer = static_cast<NSView >(m_view.window.contentView).layer;`
	`954`	`+ CALayer windowContentLayer = static_cast<NSView >([m_view window].contentView).layer;`
`954`	`955`	`ASSERT(windowContentLayer);`
`955`	`956`
`956`	`957`	`return [windowContentLayer convertRect:layer.bounds fromLayer:layer];`
`@@ -974,7 +975,7 @@ static inline NSCorrectionResponse toCorrectionResponse(AutocorrectionResponse r`
`974`	`975`
`975`	`976`	`void PageClientImpl::showPlatformContextMenu(NSMenu *menu, IntPoint location)`
`976`	`977`	`{`
`977`		`- [menu popUpMenuPositioningItem:nil atLocation:location inView:m_view];`
	`978`	`+ [menu popUpMenuPositioningItem:nil atLocation:location inView:m_view.get().get()];`
`978`	`979`	`}`
`979`	`980`
`980`	`981`	`#if ENABLE(WIRELESS_PLAYBACK_TARGET)`
`@@ -986,12 +987,14 @@ static inline NSCorrectionResponse toCorrectionResponse(AutocorrectionResponse r`
`986`	`987`
`987`	`988`	`void PageClientImpl::refView()`
`988`	`989`	`{`
`989`		`- CFRetain((__bridge CFTypeRef)m_view);`
	`990`	`+ if (RetainPtr view = m_view.get())`
	`991`	`+ CFRetain((__bridge CFTypeRef)view.get());`
`990`	`992`	`}`
`991`	`993`
`992`	`994`	`void PageClientImpl::derefView()`
`993`	`995`	`{`
`994`		`- CFRelease((__bridge CFTypeRef)m_view);`
	`996`	`+ if (RetainPtr view = m_view.get())`
	`997`	`+ CFRelease((__bridge CFTypeRef)view.get());`
`995`	`998`	`}`
`996`	`999`
`997`	`1000`	`void PageClientImpl::startWindowDrag()`
`@@ -1053,9 +1056,10 @@ static inline NSCorrectionResponse toCorrectionResponse(AutocorrectionResponse r`
`1053`	`1056`
`1054`	`1057`	`WebCore::UserInterfaceLayoutDirection PageClientImpl::userInterfaceLayoutDirection()`
`1055`	`1058`	`{`
`1056`		`- if (!m_view)`
	`1059`	`+ RetainPtr view = m_view.get();`
	`1060`	`+ if (!view)`
`1057`	`1061`	`return WebCore::UserInterfaceLayoutDirection::LTR;`
`1058`		`- return (m_view.userInterfaceLayoutDirection == NSUserInterfaceLayoutDirectionLeftToRight) ? WebCore::UserInterfaceLayoutDirection::LTR : WebCore::UserInterfaceLayoutDirection::RTL;`
	`1062`	`+ return ([view userInterfaceLayoutDirection] == NSUserInterfaceLayoutDirectionLeftToRight) ? WebCore::UserInterfaceLayoutDirection::LTR : WebCore::UserInterfaceLayoutDirection::RTL;`
`1059`	`1063`	`}`
`1060`	`1064`
`1061`	`1065`	`bool PageClientImpl::effectiveAppearanceIsDark() const`
`@@ -1143,7 +1147,7 @@ static inline NSCorrectionResponse toCorrectionResponse(AutocorrectionResponse r`
`1143`	`1147`	`{`
`1144`	`1148`	`RetainPtr webView = this->webView();`
`1145`	`1149`	`ALLOW_DEPRECATED_DECLARATIONS_BEGIN`
`1146`		`- [[PAL::getWTWritingToolsClass() sharedInstance] showTool:WebKit::convertToPlatformRequestedTool(tool) forSelectionRect:selectionRect ofView:m_view forDelegate:webView.get()];`
	`1150`	`+ [[PAL::getWTWritingToolsClass() sharedInstance] showTool:WebKit::convertToPlatformRequestedTool(tool) forSelectionRect:selectionRect ofView:m_view.get().get() forDelegate:webView.get()];`
`1147`	`1151`	`ALLOW_DEPRECATED_DECLARATIONS_END`
`1148`	`1152`	`}`
`1149`	`1153`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ - (String)currentSelectedString;`
`88`	`88`	`return;`
`89`	`89`	`}`
`90`	`90`
`91`		`- m_dropdownUI = adoptNS([[WKDataListSuggestionsController alloc] initWithInformation:WTFMove(information) inView:m_view]);`
	`91`	`+ m_dropdownUI = adoptNS([[WKDataListSuggestionsController alloc] initWithInformation:WTFMove(information) inView:m_view.get().get()]);`
`92`	`92`	`[m_dropdownUI showSuggestionsDropdown:*this];`
`93`	`93`	`}`
`94`	`94`