Address more NoUnretainedMemberChecker warnings in WebCore/

cdumez · cdumez · commit dbbcfa7f0320 · 2025-03-23T10:03:02.000-07:00
https://bugs.webkit.org/show_bug.cgi?id=290277 Reviewed by Geoffrey Garen. * Source/WebCore/SaferCPPExpectations/NoUnretainedMemberCheckerExpectations: * Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm: (WebCore::drawMemHistory): * Source/WebCore/page/mac/TextIndicatorWindow.h: * Source/WebCore/platform/ValidationBubble.h: * Source/WebCore/platform/graphics/FontPlatformData.h: (WebCore::ScopedTextMatrix::ScopedTextMatrix): (WebCore::ScopedTextMatrix::~ScopedTextMatrix): * Source/WebCore/platform/graphics/cg/CGContextStateSaver.h: (WebCore::CGContextStateSaver::CGContextStateSaver): (WebCore::CGContextStateSaver::~CGContextStateSaver): (WebCore::CGContextStateSaver::save): (WebCore::CGContextStateSaver::restore): * Source/WebCore/platform/graphics/coretext/ComplexTextControllerCoreText.mm: (WebCore::provideStringAndAttributes): * Source/WebCore/platform/ios/ValidationBubbleIOS.mm: (WebCore::ValidationBubble::setAnchorRect): * Source/WebCore/platform/mac/ValidationBubbleMac.mm: (WebCore::ValidationBubble::showRelativeTo): * Source/WebCore/platform/network/ResourceHandleInternal.h: * Source/WebCore/platform/network/mac/ResourceHandleMac.mm: (WebCore::ResourceHandle::cancel): (WebCore::ResourceHandle::didReceiveAuthenticationChallenge): (WebCore::ResourceHandle::receivedCredential): (WebCore::ResourceHandle::receivedRequestToContinueWithoutCredential): (WebCore::ResourceHandle::receivedRequestToPerformDefaultHandling): (WebCore::ResourceHandle::receivedChallengeRejection): Canonical link: https://commits.webkit.org/292560@main
diff --git a/Source/WebCore/SaferCPPExpectations/ForwardDeclCheckerExpectations b/Source/WebCore/SaferCPPExpectations/ForwardDeclCheckerExpectations
@@ -154,7 +154,6 @@ platform/mac/DataDetectorHighlight.mm
 platform/mediarecorder/MediaRecorderPrivateEncoder.h
 platform/mediastream/libwebrtc/LibWebRTCDav1dDecoder.cpp
 platform/mediastream/mac/CoreAudioSharedUnit.h
-platform/network/ResourceHandleInternal.h
 platform/network/cocoa/CredentialCocoa.h
 platform/network/cocoa/ProtectionSpaceCocoa.h
 platform/network/mac/FormDataStreamMac.mm
diff --git a/Source/WebCore/SaferCPPExpectations/NoUnretainedMemberCheckerExpectations b/Source/WebCore/SaferCPPExpectations/NoUnretainedMemberCheckerExpectations
@@ -3,13 +3,6 @@ PAL/pal/spi/mac/NSGraphicsSPI.h
 accessibility/mac/AccessibilityObjectMac.mm
 accessibility/mac/WebAccessibilityObjectWrapperBase.mm
 page/EventHandler.h
-page/cocoa/ResourceUsageOverlayCocoa.mm
-page/mac/TextIndicatorWindow.h
-platform/ValidationBubble.h
-platform/graphics/FontPlatformData.h
-platform/graphics/cg/CGContextStateSaver.h
 platform/graphics/cg/CGSubimageCacheWithTimer.cpp
-platform/graphics/coretext/ComplexTextControllerCoreText.mm
 platform/graphics/mac/LegacyDisplayRefreshMonitorMac.h
-platform/network/ResourceHandleInternal.h
-platform/network/cf/FormDataStreamCFNet.cpp
+platform/network/cf/FormDataStreamCFNet.cpp
diff --git a/Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm b/Source/WebCore/page/cocoa/ResourceUsageOverlayCocoa.mm
@@ -373,7 +373,7 @@ static void drawMemHistory(CGContextRef context, float x1, float y1, float y2, H
     CGContextSetLineWidth(context, 1);
 
     struct ColorAndSize {
-        CGColorRef color;
+        RetainPtr<CGColorRef> color;
         size_t size;
     };
 
@@ -396,7 +396,7 @@ static void drawMemHistory(CGContextRef context, float x1, float y1, float y2, H
             CGContextBeginPath(context);
             CGContextMoveToPoint(context, x1 + i, currentY2);
             CGContextAddLineToPoint(context, x1 + i, nextY2);
-            CGContextSetStrokeColorWithColor(context, colorAndSize.color);
+            CGContextSetStrokeColorWithColor(context, colorAndSize.color.get());
             CGContextStrokePath(context);
             currentY2 = nextY2;
         }
diff --git a/Source/WebCore/page/mac/TextIndicatorWindow.h b/Source/WebCore/page/mac/TextIndicatorWindow.h
@@ -32,6 +32,7 @@
 #import <wtf/RetainPtr.h>
 #import <wtf/RunLoop.h>
 #import <wtf/TZoneMalloc.h>
+#import <wtf/WeakObjCPtr.h>
 
 OBJC_CLASS NSView;
 OBJC_CLASS WebTextIndicatorLayer;
@@ -58,7 +59,7 @@ class TextIndicatorWindow final : public CanMakeCheckedPtr<TextIndicatorWindow>
 
     void startFadeOut();
 
-    NSView *m_targetView;
+    WeakObjCPtr<NSView> m_targetView;
     RefPtr<TextIndicator> m_textIndicator;
     RetainPtr<NSWindow> m_textIndicatorWindow;
     RetainPtr<NSView> m_textIndicatorView;
diff --git a/Source/WebCore/platform/ValidationBubble.h b/Source/WebCore/platform/ValidationBubble.h
@@ -96,7 +96,11 @@ class ValidationBubble : public RefCounted<ValidationBubble> {
     WEBCORE_EXPORT ValidationBubble(PlatformView*, const String& message, const Settings&);
 #endif
 
+#if PLATFORM(COCOA)
+    WeakObjCPtr<PlatformView> m_view;
+#else
     PlatformView* m_view;
+#endif
     String m_message;
     double m_fontSize { 0 };
 #if PLATFORM(MAC)
diff --git a/Source/WebCore/platform/graphics/FontPlatformData.h b/Source/WebCore/platform/graphics/FontPlatformData.h
@@ -510,12 +510,12 @@ class ScopedTextMatrix {
         : m_context(context)
         , m_textMatrix(CGContextGetTextMatrix(context))
     {
-        CGContextSetTextMatrix(m_context, newMatrix);
+        CGContextSetTextMatrix(m_context.get(), newMatrix);
     }
 
     ~ScopedTextMatrix()
     {
-        CGContextSetTextMatrix(m_context, m_textMatrix);
+        CGContextSetTextMatrix(m_context.get(), m_textMatrix);
     }
 
     CGAffineTransform savedMatrix() const
@@ -524,7 +524,7 @@ class ScopedTextMatrix {
     }
 
 private:
-    CGContextRef m_context;
+    RetainPtr<CGContextRef> m_context;
     CGAffineTransform m_textMatrix;
 };
 
diff --git a/Source/WebCore/platform/graphics/cg/CGContextStateSaver.h b/Source/WebCore/platform/graphics/cg/CGContextStateSaver.h
@@ -36,26 +36,26 @@ class CGContextStateSaver {
         , m_saveAndRestore(saveAndRestore)
     {
         if (m_saveAndRestore)
-            CGContextSaveGState(m_context);
+            CGContextSaveGState(m_context.get());
     }
     
     ~CGContextStateSaver()
     {
         if (m_saveAndRestore)
-            CGContextRestoreGState(m_context);
+            CGContextRestoreGState(m_context.get());
     }
     
     void save()
     {
         ASSERT(!m_saveAndRestore);
-        CGContextSaveGState(m_context);
+        CGContextSaveGState(m_context.get());
         m_saveAndRestore = true;
     }
 
     void restore()
     {
         ASSERT(m_saveAndRestore);
-        CGContextRestoreGState(m_context);
+        CGContextRestoreGState(m_context.get());
         m_saveAndRestore = false;
     }
     
@@ -65,7 +65,7 @@ class CGContextStateSaver {
     }
     
 private:
-    CGContextRef m_context;
+    RetainPtr<CGContextRef> m_context;
     bool m_saveAndRestore;
 };
 
diff --git a/Source/WebCore/platform/graphics/coretext/ComplexTextControllerCoreText.mm b/Source/WebCore/platform/graphics/coretext/ComplexTextControllerCoreText.mm
@@ -137,7 +137,7 @@
 
 struct ProviderInfo {
     std::span<const UChar> cp;
-    CFDictionaryRef attributes;
+    RetainPtr<CFDictionaryRef> attributes;
 };
 
 static const UniChar* provideStringAndAttributes(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void* refCon)
@@ -147,7 +147,7 @@
         return 0;
 
     *charCount = info->cp.size() - stringIndex;
-    *attributes = info->attributes;
+    *attributes = info->attributes.get();
     return reinterpret_cast<const UniChar*>(info->cp.subspan(stringIndex).data());
 }
 
diff --git a/Source/WebCore/platform/ios/ValidationBubbleIOS.mm b/Source/WebCore/platform/ios/ValidationBubbleIOS.mm
@@ -218,17 +218,18 @@ - (UIModalPresentationStyle)adaptivePresentationStyleForPresentationController:(
 
 void ValidationBubble::setAnchorRect(const IntRect& anchorRect, UIViewController *presentingViewController)
 {
+    RetainPtr view = m_view.get();
     if (!presentingViewController)
-        presentingViewController = fallbackViewController(m_view);
+        presentingViewController = fallbackViewController(view.get());
 
     if (!presentingViewController)
         return;
 
     UIPopoverPresentationController *presentationController = [m_popoverController popoverPresentationController];
     m_popoverDelegate = adoptNS([[WebValidationBubbleDelegate alloc] init]);
     presentationController.delegate = m_popoverDelegate.get();
-    presentationController.passthroughViews = @[ presentingViewController.view, m_view ];
-    presentationController.sourceView = m_view;
+    presentationController.passthroughViews = @[ presentingViewController.view, view.get() ];
+    presentationController.sourceView = view.get();
     presentationController.sourceRect = CGRectMake(anchorRect.x(), anchorRect.y(), anchorRect.width(), anchorRect.height());
     m_presentingViewController = presentingViewController;
 }
diff --git a/Source/WebCore/platform/mac/ValidationBubbleMac.mm b/Source/WebCore/platform/mac/ValidationBubbleMac.mm
@@ -87,11 +87,12 @@ - (void)mouseDown:(NSEvent *)event
 void ValidationBubble::showRelativeTo(const IntRect& anchorRect)
 {
     // Passing an unparented view to [m_popover showRelativeToRect:ofView:preferredEdge:] crashes.
-    if (![m_view window])
+    RetainPtr view = m_view.get();
+    if (![view window])
         return;
 
     NSRect rect = NSMakeRect(anchorRect.x(), anchorRect.y(), anchorRect.width(), anchorRect.height());
-    [m_popover showRelativeToRect:rect ofView:m_view preferredEdge:NSMinYEdge];
+    [m_popover showRelativeToRect:rect ofView:view.get() preferredEdge:NSMinYEdge];
 }
 
 } // namespace WebCore
diff --git a/Source/WebCore/platform/network/ResourceHandleInternal.h b/Source/WebCore/platform/network/ResourceHandleInternal.h
@@ -34,6 +34,8 @@
 #include <wtf/MonotonicTime.h>
 
 #if PLATFORM(COCOA)
+#include <wtf/WeakObjCPtr.h>
+
 OBJC_CLASS NSURLAuthenticationChallenge;
 OBJC_CLASS NSURLConnection;
 
@@ -94,7 +96,7 @@ class ResourceHandleInternal {
 
     // We need to keep a reference to the original challenge to be able to cancel it.
     // It is almost identical to m_currentWebChallenge.nsURLAuthenticationChallenge(), but has a different sender.
-    NSURLAuthenticationChallenge *m_currentMacChallenge { nil };
+    WeakObjCPtr<NSURLAuthenticationChallenge> m_currentMacChallenge;
 #endif
     Box<NetworkLoadMetrics> m_networkLoadMetrics;
     MonotonicTime m_startTime;
diff --git a/Source/WebCore/platform/network/mac/ResourceHandleMac.mm b/Source/WebCore/platform/network/mac/ResourceHandleMac.mm
@@ -285,8 +285,8 @@ static bool synchronousWillSendRequestEnabled()
     LOG(Network, "Handle %p cancel connection %p", this, d->m_connection.get());
 
     // Leaks were seen on HTTP tests without this; can be removed once <rdar://problem/6886937> is fixed.
-    if (d->m_currentMacChallenge)
-        [[d->m_currentMacChallenge sender] cancelAuthenticationChallenge:d->m_currentMacChallenge];
+    if (RetainPtr challenge = d->m_currentMacChallenge.get())
+        [[challenge sender] cancelAuthenticationChallenge:challenge.get()];
 
     [d->m_connection.get() cancel];
 }
@@ -509,7 +509,7 @@ static bool synchronousWillSendRequestEnabled()
 #endif // PLATFORM(IOS_FAMILY)
 
     d->m_currentMacChallenge = challenge.nsURLAuthenticationChallenge();
-    d->m_currentWebChallenge = core(d->m_currentMacChallenge);
+    d->m_currentWebChallenge = core(d->m_currentMacChallenge.get().get());
     d->m_currentWebChallenge.setAuthenticationClient(this);
 
     // FIXME: Several concurrent requests can return with the an authentication challenge for the same protection space.
@@ -594,6 +594,7 @@ static bool synchronousWillSendRequestEnabled()
         return;
     }
 
+    RetainPtr currentChallenge = d->m_currentMacChallenge.get();
     if (credential.persistence() == CredentialPersistence::ForSession && challenge.protectionSpace().authenticationScheme() != ProtectionSpace::AuthenticationScheme::ServerTrustEvaluationRequested) {
         // Manage per-session credentials internally, because once NSURLCredentialPersistenceForSession is used, there is no way
         // to ignore it for a particular request (short of removing it altogether).
@@ -602,10 +603,10 @@ static bool synchronousWillSendRequestEnabled()
         if (challenge.failureResponse().httpStatusCode() == httpStatus401Unauthorized)
             urlToStore = challenge.failureResponse().url();
         if (auto* networkStorageSession = d->m_context->storageSession())
-            networkStorageSession->credentialStorage().set(d->m_partition, webCredential, ProtectionSpace([d->m_currentMacChallenge protectionSpace]), urlToStore);
-        [[d->m_currentMacChallenge sender] useCredential:webCredential.nsCredential() forAuthenticationChallenge:d->m_currentMacChallenge];
+            networkStorageSession->credentialStorage().set(d->m_partition, webCredential, ProtectionSpace([currentChallenge protectionSpace]), urlToStore);
+        [[currentChallenge sender] useCredential:webCredential.nsCredential() forAuthenticationChallenge:currentChallenge.get()];
     } else
-        [[d->m_currentMacChallenge sender] useCredential:credential.nsCredential() forAuthenticationChallenge:d->m_currentMacChallenge];
+        [[currentChallenge sender] useCredential:credential.nsCredential() forAuthenticationChallenge:currentChallenge.get()];
 
     clearAuthentication();
 }
@@ -618,7 +619,8 @@ static bool synchronousWillSendRequestEnabled()
     if (!AuthenticationChallengeBase::equalForWebKitLegacyChallengeComparison(challenge, d->m_currentWebChallenge))
         return;
 
-    [[d->m_currentMacChallenge sender] continueWithoutCredentialForAuthenticationChallenge:d->m_currentMacChallenge];
+    RetainPtr currentChallenge = d->m_currentMacChallenge.get();
+    [[currentChallenge sender] continueWithoutCredentialForAuthenticationChallenge:currentChallenge.get()];
 
     clearAuthentication();
 }
@@ -642,7 +644,8 @@ static bool synchronousWillSendRequestEnabled()
     if (!AuthenticationChallengeBase::equalForWebKitLegacyChallengeComparison(challenge, d->m_currentWebChallenge))
         return;
 
-    [[d->m_currentMacChallenge sender] performDefaultHandlingForAuthenticationChallenge:d->m_currentMacChallenge];
+    RetainPtr currentChallenge = d->m_currentMacChallenge.get();
+    [[currentChallenge sender] performDefaultHandlingForAuthenticationChallenge:currentChallenge.get()];
 
     clearAuthentication();
 }
@@ -655,7 +658,8 @@ static bool synchronousWillSendRequestEnabled()
     if (!AuthenticationChallengeBase::equalForWebKitLegacyChallengeComparison(challenge, d->m_currentWebChallenge))
         return;
 
-    [[d->m_currentMacChallenge sender] rejectProtectionSpaceAndContinueWithChallenge:d->m_currentMacChallenge];
+    RetainPtr currentChallenge = d->m_currentMacChallenge.get();
+    [[currentChallenge sender] rejectProtectionSpaceAndContinueWithChallenge:currentChallenge.get()];
 
     clearAuthentication();
 }

Original file line number	Diff line number	Diff line change
`@@ -510,12 +510,12 @@ class ScopedTextMatrix {`
`510`	`510`	`: m_context(context)`
`511`	`511`	`, m_textMatrix(CGContextGetTextMatrix(context))`
`512`	`512`	`{`
`513`		`- CGContextSetTextMatrix(m_context, newMatrix);`
	`513`	`+ CGContextSetTextMatrix(m_context.get(), newMatrix);`
`514`	`514`	`}`
`515`	`515`
`516`	`516`	`~ScopedTextMatrix()`
`517`	`517`	`{`
`518`		`- CGContextSetTextMatrix(m_context, m_textMatrix);`
	`518`	`+ CGContextSetTextMatrix(m_context.get(), m_textMatrix);`
`519`	`519`	`}`
`520`	`520`
`521`	`521`	`CGAffineTransform savedMatrix() const`
`@@ -524,7 +524,7 @@ class ScopedTextMatrix {`
`524`	`524`	`}`
`525`	`525`
`526`	`526`	`private:`
`527`		`- CGContextRef m_context;`
	`527`	`+ RetainPtr<CGContextRef> m_context;`
`528`	`528`	`CGAffineTransform m_textMatrix;`
`529`	`529`	`};`
`530`	`530`
Original file line number	Diff line number	Diff line change
`@@ -36,26 +36,26 @@ class CGContextStateSaver {`
`36`	`36`	`, m_saveAndRestore(saveAndRestore)`
`37`	`37`	`{`
`38`	`38`	`if (m_saveAndRestore)`
`39`		`- CGContextSaveGState(m_context);`
	`39`	`+ CGContextSaveGState(m_context.get());`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`~CGContextStateSaver()`
`43`	`43`	`{`
`44`	`44`	`if (m_saveAndRestore)`
`45`		`- CGContextRestoreGState(m_context);`
	`45`	`+ CGContextRestoreGState(m_context.get());`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`void save()`
`49`	`49`	`{`
`50`	`50`	`ASSERT(!m_saveAndRestore);`
`51`		`- CGContextSaveGState(m_context);`
	`51`	`+ CGContextSaveGState(m_context.get());`
`52`	`52`	`m_saveAndRestore = true;`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`void restore()`
`56`	`56`	`{`
`57`	`57`	`ASSERT(m_saveAndRestore);`
`58`		`- CGContextRestoreGState(m_context);`
	`58`	`+ CGContextRestoreGState(m_context.get());`
`59`	`59`	`m_saveAndRestore = false;`
`60`	`60`	`}`
`61`	`61`
`@@ -65,7 +65,7 @@ class CGContextStateSaver {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`private:`
`68`		`- CGContextRef m_context;`
	`68`	`+ RetainPtr<CGContextRef> m_context;`
`69`	`69`	`bool m_saveAndRestore;`
`70`	`70`	`};`
`71`	`71`
Original file line number	Diff line number	Diff line change
`@@ -87,11 +87,12 @@ - (void)mouseDown:(NSEvent *)event`
`87`	`87`	`void ValidationBubble::showRelativeTo(const IntRect& anchorRect)`
`88`	`88`	`{`
`89`	`89`	`// Passing an unparented view to [m_popover showRelativeToRect:ofView:preferredEdge:] crashes.`
`90`		`- if (![m_view window])`
	`90`	`+ RetainPtr view = m_view.get();`
	`91`	`+ if (![view window])`
`91`	`92`	`return;`
`92`	`93`
`93`	`94`	`NSRect rect = NSMakeRect(anchorRect.x(), anchorRect.y(), anchorRect.width(), anchorRect.height());`
`94`		`- [m_popover showRelativeToRect:rect ofView:m_view preferredEdge:NSMinYEdge];`
	`95`	`+ [m_popover showRelativeToRect:rect ofView:view.get() preferredEdge:NSMinYEdge];`
`95`	`96`	`}`
`96`	`97`
`97`	`98`	`} // namespace WebCore`