Skip to content

Commit 1ca7a04

Browse files
committed
Deploy more RetainPtr in WebKit to prepare for the next LLVM update
https://bugs.webkit.org/show_bug.cgi?id=299281 Reviewed by NOBODY (OOPS!). Deploy more RetainPtr to prepare WebKit for the next LLVM update for: llvm/llvm-project#160569 No new tests since there should be no behavioral change.
1 parent 1730c14 commit 1ca7a04

File tree

99 files changed

+604
-599
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+604
-599
lines changed

Source/WebKit/NetworkProcess/CustomProtocols/Cocoa/LegacyCustomProtocolManagerCocoa.mm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ static inline void dispatchOnInitializationRunLoop(WKCustomProtocol* protocol, v
185185
RetainPtr<NSError> nsError = error.nsError();
186186

187187
dispatchOnInitializationRunLoop(protocol.get(), ^ {
188-
[[protocol client] URLProtocol:protocol.get() didFailWithError:nsError.get()];
188+
[retainPtr([protocol client]) URLProtocol:protocol.get() didFailWithError:nsError.get()];
189189
});
190190

191191
removeCustomProtocol(customProtocolID);
@@ -200,7 +200,7 @@ static inline void dispatchOnInitializationRunLoop(WKCustomProtocol* protocol, v
200200
RetainPtr nsData = toNSData(data);
201201

202202
dispatchOnInitializationRunLoop(protocol.get(), ^ {
203-
[[protocol client] URLProtocol:protocol.get() didLoadData:nsData.get()];
203+
[retainPtr([protocol client]) URLProtocol:protocol.get() didLoadData:nsData.get()];
204204
});
205205
}
206206

@@ -213,7 +213,7 @@ static inline void dispatchOnInitializationRunLoop(WKCustomProtocol* protocol, v
213213
RetainPtr<NSURLResponse> nsResponse = response.nsURLResponse();
214214

215215
dispatchOnInitializationRunLoop(protocol.get(), ^ {
216-
[[protocol client] URLProtocol:protocol.get() didReceiveResponse:nsResponse.get() cacheStoragePolicy:toNSURLCacheStoragePolicy(cacheStoragePolicy)];
216+
[retainPtr([protocol client]) URLProtocol:protocol.get() didReceiveResponse:nsResponse.get() cacheStoragePolicy:toNSURLCacheStoragePolicy(cacheStoragePolicy)];
217217
});
218218
}
219219

@@ -224,7 +224,7 @@ static inline void dispatchOnInitializationRunLoop(WKCustomProtocol* protocol, v
224224
return;
225225

226226
dispatchOnInitializationRunLoop(protocol.get(), ^ {
227-
[[protocol client] URLProtocolDidFinishLoading:protocol.get()];
227+
[retainPtr([protocol client]) URLProtocolDidFinishLoading:protocol.get()];
228228
});
229229

230230
removeCustomProtocol(customProtocolID);
@@ -240,7 +240,7 @@ static inline void dispatchOnInitializationRunLoop(WKCustomProtocol* protocol, v
240240
RetainPtr<NSURLResponse> nsRedirectResponse = redirectResponse.nsURLResponse();
241241

242242
dispatchOnInitializationRunLoop(protocol.get(), [protocol, nsRequest, nsRedirectResponse]() {
243-
[[protocol client] URLProtocol:protocol.get() wasRedirectedToRequest:nsRequest.get() redirectResponse:nsRedirectResponse.get()];
243+
[retainPtr([protocol client]) URLProtocol:protocol.get() wasRedirectedToRequest:nsRequest.get() redirectResponse:nsRedirectResponse.get()];
244244
});
245245
}
246246

Source/WebKit/NetworkProcess/Downloads/cocoa/WKDownloadProgress.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ - (void)_updateProgressExtendedAttributeOnProgressFile
273273
float fraction = (total > 0) ? (float)completed / (float)total : -1;
274274
auto xattrContents = adoptNS([[NSString alloc] initWithFormat:@"%.3f", fraction]);
275275

276-
setxattr(self.fileURL.fileSystemRepresentation, "com.apple.progress.fractionCompleted", xattrContents.get().UTF8String, [xattrContents.get() lengthOfBytesUsingEncoding:NSUTF8StringEncoding], 0, 0);
276+
setxattr(RetainPtr { self.fileURL }.get().fileSystemRepresentation, "com.apple.progress.fractionCompleted", xattrContents.get().UTF8String, [xattrContents.get() lengthOfBytesUsingEncoding:NSUTF8StringEncoding], 0, 0);
277277
}
278278

279279
- (void)dealloc

Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ static float toNSURLSessionTaskPriority(WebCore::ResourceLoadPriority priority)
175175

176176
CheckedPtr session = networkSession();
177177
auto cnameDomain = [this]() {
178-
if (RetainPtr lastResolvedCNAMEInChain = [[m_task _resolvedCNAMEChain] lastObject])
178+
if (RetainPtr lastResolvedCNAMEInChain = [retainPtr([m_task _resolvedCNAMEChain]) lastObject])
179179
return lastCNAMEDomain(lastResolvedCNAMEInChain.get());
180180
return WebCore::RegistrableDomain { };
181181
}();
@@ -420,7 +420,7 @@ static float toNSURLSessionTaskPriority(WebCore::ResourceLoadPriority priority)
420420
if (isTopLevelNavigation())
421421
updateFirstPartyInfoForSession(response.url());
422422
#if ENABLE(NETWORK_ISSUE_REPORTING)
423-
else if (NetworkIssueReporter::shouldReport([m_task _incompleteTaskMetrics])) {
423+
else if (NetworkIssueReporter::shouldReport(RetainPtr { [m_task _incompleteTaskMetrics] }.get())) {
424424
if (CheckedPtr session = networkSession())
425425
session->reportNetworkIssue(*m_webPageProxyID, firstRequest().url());
426426
}
@@ -585,7 +585,7 @@ static float toNSURLSessionTaskPriority(WebCore::ResourceLoadPriority priority)
585585
{
586586
if (!m_suggestedFilename.isEmpty())
587587
return m_suggestedFilename;
588-
return m_task.get().response.suggestedFilename;
588+
return RetainPtr { m_task.get().response }.get().suggestedFilename;
589589
}
590590

591591
void NetworkDataTaskCocoa::cancel()
@@ -668,7 +668,8 @@ static float toNSURLSessionTaskPriority(WebCore::ResourceLoadPriority priority)
668668

669669
WebCore::Credential serverTrustCredential(const WebCore::AuthenticationChallenge& challenge)
670670
{
671-
return WebCore::Credential([NSURLCredential credentialForTrust: RetainPtr { challenge.protectedNSURLAuthenticationChallenge().get().protectionSpace.serverTrust }.get()]);
671+
auto protectionSpace = retainPtr(challenge.protectedNSURLAuthenticationChallenge().get().protectionSpace);
672+
return WebCore::Credential([NSURLCredential credentialForTrust: RetainPtr { protectionSpace.get().serverTrust }.get()]);
672673
}
673674

674675
String NetworkDataTaskCocoa::description() const

0 commit comments

Comments
 (0)