Diff
Modified: trunk/Source/WTF/ChangeLog (282847 => 282848)
--- trunk/Source/WTF/ChangeLog 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WTF/ChangeLog 2021-09-21 23:03:37 UTC (rev 282848)
@@ -1,3 +1,12 @@
+2021-09-21 Chris Dumez <[email protected]>
+
+ Drop makeRefPtr() and use RefPtr { } directly instead
+ https://bugs.webkit.org/show_bug.cgi?id=230564
+
+ Reviewed by Alex Christensen.
+
+ * wtf/RefPtr.h:
+
2021-09-21 David Kilzer <[email protected]>
Rename {checked,dynamic}_ns_cast<> to {checked,dynamic}_objc_cast<>
Modified: trunk/Source/WTF/wtf/RefPtr.h (282847 => 282848)
--- trunk/Source/WTF/wtf/RefPtr.h 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WTF/wtf/RefPtr.h 2021-09-21 23:03:37 UTC (rev 282848)
@@ -253,16 +253,6 @@
return RefPtr<T, U, V>(p, RefPtr<T, U, V>::Adopt);
}
-template<typename T> inline RefPtr<T> makeRefPtr(T* pointer)
-{
- return pointer;
-}
-
-template<typename T> inline RefPtr<T> makeRefPtr(T& reference)
-{
- return &reference;
-}
-
template<typename ExpectedType, typename ArgType, typename PtrTraits, typename RefDerefTraits>
inline bool is(RefPtr<ArgType, PtrTraits, RefDerefTraits>& source)
{
@@ -279,5 +269,4 @@
using WTF::RefPtr;
using WTF::adoptRef;
-using WTF::makeRefPtr;
using WTF::static_pointer_cast;
Modified: trunk/Source/WebKit/ChangeLog (282847 => 282848)
--- trunk/Source/WebKit/ChangeLog 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/ChangeLog 2021-09-21 23:03:37 UTC (rev 282848)
@@ -1,3 +1,155 @@
+2021-09-21 Chris Dumez <[email protected]>
+
+ Drop makeRefPtr() and use RefPtr { } directly instead
+ https://bugs.webkit.org/show_bug.cgi?id=230564
+
+ Reviewed by Alex Christensen.
+
+ * GPUProcess/graphics/RemoteRenderingBackend.cpp:
+ (WebKit::RemoteRenderingBackend::nextDestinationImageBufferAfterApplyingDisplayLists):
+ (WebKit::RemoteRenderingBackend::wakeUpAndApplyDisplayList):
+ * NetworkProcess/IndexedDB/WebIDBServer.cpp:
+ (WebKit::WebIDBServer::addConnection):
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (-[WKNetworkSessionDelegate URLSession:task:didReceiveChallenge:completionHandler:]):
+ * Platform/IPC/Connection.cpp:
+ (IPC::Connection::MessagesThrottler::scheduleMessagesDispatch):
+ * Shared/WebHitTestResultData.cpp:
+ (WebKit::WebHitTestResultData::WebHitTestResultData):
+ * Shared/mac/MediaFormatReader/MediaFormatReader.cpp:
+ (WebKit::MediaFormatReader::parseByteSource):
+ * UIProcess/API/glib/WebKitWebView.cpp:
+ (webkitWebViewCreateNewPage):
+ * UIProcess/Automation/WebAutomationSession.cpp:
+ (WebKit::WebAutomationSession::setWindowFrameOfBrowsingContext):
+ (WebKit::WebAutomationSession::maximizeWindowOfBrowsingContext):
+ (WebKit::WebAutomationSession::hideWindowOfBrowsingContext):
+ * UIProcess/Cocoa/UIDelegate.mm:
+ (WebKit::UIDelegate::UIClient::runOpenPanel):
+ (WebKit::UIDelegate::UIClient::requestPointerLock):
+ * UIProcess/Cocoa/WebPageProxyCocoa.mm:
+ (WebKit::WebPageProxy::scheduleActivityStateUpdate):
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (-[WKProcessPoolWeakObserver pool]):
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::terminateUnresponsiveServiceWorkerProcesses):
+ * UIProcess/WebContextMenuProxy.cpp:
+ (WebKit::WebContextMenuProxy::useContextMenuItems):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::handlePreventableTouchEvent):
+ (WebKit::WebPageProxy::didStartProvisionalLoadForFrameShared):
+ (WebKit::WebPageProxy::decidePolicyForNavigationAction):
+ (WebKit::WebPageProxy::runModalJavaScriptDialog):
+ (WebKit::WebPageProxy::runJavaScriptAlert):
+ (WebKit::WebPageProxy::runJavaScriptConfirm):
+ (WebKit::WebPageProxy::runJavaScriptPrompt):
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::processForNavigation):
+ * UIProcess/ios/ViewGestureControllerIOS.mm:
+ (WebKit::ViewGestureController::beginSwipeGesture):
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ (WebKit::WebContextMenuProxyMac::getContextMenuFromItems):
+ (WebKit::WebContextMenuProxyMac::insertOrUpdateQuickLookImageItem):
+ * WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp:
+ (WebKit::RemoteRenderingBackendProxy::waitForDidCreateImageBufferBackend):
+ (WebKit::RemoteRenderingBackendProxy::waitForDidFlush):
+ (WebKit::RemoteRenderingBackendProxy::findReusableDisplayListHandle):
+ * WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp:
+ (WebKit::MediaPlayerPrivateRemote::prepareForPlayback):
+ (WebKit::MediaPlayerPrivateRemote::load):
+ (WebKit::MediaPlayerPrivateRemote::networkStateChanged):
+ (WebKit::MediaPlayerPrivateRemote::setReadyState):
+ (WebKit::MediaPlayerPrivateRemote::readyStateChanged):
+ (WebKit::MediaPlayerPrivateRemote::volumeChanged):
+ (WebKit::MediaPlayerPrivateRemote::muteChanged):
+ (WebKit::MediaPlayerPrivateRemote::timeChanged):
+ (WebKit::MediaPlayerPrivateRemote::durationChanged):
+ (WebKit::MediaPlayerPrivateRemote::rateChanged):
+ (WebKit::MediaPlayerPrivateRemote::playbackStateChanged):
+ (WebKit::MediaPlayerPrivateRemote::engineFailedToLoad):
+ (WebKit::MediaPlayerPrivateRemote::characteristicChanged):
+ (WebKit::MediaPlayerPrivateRemote::sizeChanged):
+ (WebKit::MediaPlayerPrivateRemote::firstVideoFrameAvailable):
+ (WebKit::MediaPlayerPrivateRemote::renderingModeChanged):
+ (WebKit::MediaPlayerPrivateRemote::acceleratedRenderingStateChanged):
+ (WebKit::MediaPlayerPrivateRemote::addRemoteAudioTrack):
+ (WebKit::MediaPlayerPrivateRemote::removeRemoteAudioTrack):
+ (WebKit::MediaPlayerPrivateRemote::addRemoteTextTrack):
+ (WebKit::MediaPlayerPrivateRemote::removeRemoteTextTrack):
+ (WebKit::MediaPlayerPrivateRemote::addRemoteVideoTrack):
+ (WebKit::MediaPlayerPrivateRemote::removeRemoteVideoTrack):
+ (WebKit::MediaPlayerPrivateRemote::currentPlaybackTargetIsWirelessChanged):
+ (WebKit::MediaPlayerPrivateRemote::mediaPlayerKeyNeeded):
+ (WebKit::MediaPlayerPrivateRemote::waitingForKeyChanged):
+ (WebKit::MediaPlayerPrivateRemote::initializationDataEncountered):
+ (WebKit::MediaPlayerPrivateRemote::resourceNotSupported):
+ (WebKit::MediaPlayerPrivateRemote::activeSourceBuffersChanged):
+ (WebKit::MediaPlayerPrivateRemote::getRawCookies const):
+ * WebProcess/GPU/webrtc/MediaRecorderPrivate.cpp:
+ (WebKit::MediaRecorderPrivate::startRecording):
+ * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp:
+ (WebKit::InjectedBundleRangeHandle::renderedImage):
+ * WebProcess/Network/WebLoaderStrategy.cpp:
+ (WebKit::WebLoaderStrategy::scheduleLoad):
+ (WebKit::WebLoaderStrategy::scheduleLoadFromNetworkProcess):
+ * WebProcess/Notifications/WebNotificationManager.cpp:
+ (WebKit::WebNotificationManager::didDestroyNotification):
+ * WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
+ (WebKit::WebDragClient::declareAndWriteDragImage):
+ * WebProcess/WebPage/FindController.cpp:
+ (WebKit::FindController::findStringMatches):
+ * WebProcess/WebPage/IPCTestingAPI.cpp:
+ (WebKit::IPCTestingAPI::JSIPCSemaphore::signal):
+ (WebKit::IPCTestingAPI::JSIPCSemaphore::waitFor):
+ (WebKit::IPCTestingAPI::JSSharedMemory::readBytes):
+ (WebKit::IPCTestingAPI::JSSharedMemory::writeBytes):
+ (WebKit::IPCTestingAPI::JSIPC::addMessageListener):
+ (WebKit::IPCTestingAPI::encodeRemoteRenderingBackendCreationParameters):
+ (WebKit::IPCTestingAPI::encodeSharedMemory):
+ (WebKit::IPCTestingAPI::encodeSemaphore):
+ (WebKit::IPCTestingAPI::encodeArgument):
+ (WebKit::IPCTestingAPI::JSIPC::sendMessage):
+ (WebKit::IPCTestingAPI::JSIPC::sendSyncMessage):
+ (WebKit::IPCTestingAPI::JSIPC::vmPageSize):
+ * WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDrawingArea.mm:
+ (WebKit::RemoteLayerTreeDrawingArea::addCommitHandlers):
+ * WebProcess/WebPage/ViewGestureGeometryCollector.cpp:
+ (WebKit::ViewGestureGeometryCollector::computeTextLegibilityScales):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::runJavaScriptInFrameInScriptWorld):
+ (WebKit::WebPage::getContentsAsString):
+ (WebKit::WebPage::removeDataDetectedLinks):
+ (WebKit::WebPage::detectDataInAllFrames):
+ (WebKit::WebPage::startTextManipulations):
+ (WebKit::WebPage::completeTextManipulation):
+ (WebKit::WebPage::requestTextRecognition):
+ (WebKit::WebPage::updateWithTextRecognitionResult):
+ (WebKit::WebPage::createAppHighlightInSelectedRange):
+ (WebKit::WebPage::setAppHighlightsVisibility):
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::getPlatformEditorState const):
+ (WebKit::insideImageOverlay):
+ (WebKit::expandForImageOverlay):
+ (WebKit::rangeForPointInRootViewCoordinates):
+ (WebKit::WebPage::rootViewBounds):
+ (WebKit::WebPage::absoluteInteractionBounds):
+ (WebKit::WebPage::rootViewInteractionBounds):
+ (WebKit::WebPage::requestEvasionRectsAboveSelection):
+ (WebKit::dataDetectorImageOverlayPositionInformation):
+ (WebKit::selectionPositionInformation):
+ (WebKit::populateCaretContext):
+ (WebKit::WebPage::positionInformation):
+ (WebKit::WebPage::performActionOnElement):
+ (WebKit::WebPage::shrinkToFitContent):
+ (WebKit::WebPage::updateVisibleContentRects):
+ (WebKit::WebPage::updateSelectionWithDelta):
+ (WebKit::WebPage::requestDocumentEditingContext):
+ (WebKit::WebPage::animationDidFinishForElement):
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::addCommitHandlers):
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::performImmediateActionHitTestAtLocation):
+
2021-09-21 Megan Gardner <[email protected]>
Remove unused selection parameter.
Modified: trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp (282847 => 282848)
--- trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp 2021-09-21 23:03:37 UTC (rev 282848)
@@ -236,8 +236,8 @@
RefPtr<ImageBuffer> RemoteRenderingBackend::nextDestinationImageBufferAfterApplyingDisplayLists(ImageBuffer& initialDestination, size_t initialOffset, DisplayListReaderHandle& handle, GPUProcessWakeupReason reason)
{
- auto destination = makeRefPtr(initialDestination);
- auto handleProtector = makeRef(handle);
+ RefPtr destination { &initialDestination };
+ Ref handleProtector { handle };
auto offset = initialOffset;
size_t sizeToRead = 0;
@@ -269,7 +269,7 @@
MESSAGE_CHECK_WITH_RETURN_VALUE(offset <= handle.sharedMemory().size(), nullptr, "Out-of-bounds offset into shared display list handle");
if (result.reasonForStopping == DisplayList::StopReplayReason::ChangeDestinationImageBuffer) {
- destination = makeRefPtr(m_remoteResourceCache.cachedImageBuffer(*result.nextDestinationImageBuffer));
+ destination = m_remoteResourceCache.cachedImageBuffer(*result.nextDestinationImageBuffer);
if (!destination) {
ASSERT(!m_pendingWakeupInfo);
m_pendingWakeupInfo = {{
@@ -311,7 +311,7 @@
auto newDestinationIdentifier = makeObjectIdentifier<RenderingResourceIdentifierType>(resumeReadingInfo->destination);
MESSAGE_CHECK_WITH_RETURN_VALUE(newDestinationIdentifier.isValid(), nullptr, "Invalid image buffer destination when resuming display list processing");
- destination = makeRefPtr(m_remoteResourceCache.cachedImageBuffer(newDestinationIdentifier));
+ destination = m_remoteResourceCache.cachedImageBuffer(newDestinationIdentifier);
MESSAGE_CHECK_WITH_RETURN_VALUE(destination, nullptr, "Missing image buffer destination when resuming display list processing");
offset = resumeReadingInfo->offset;
@@ -329,7 +329,7 @@
updateLastKnownState(RemoteRenderingBackendState::BeganReplayingDisplayList);
- auto destinationImageBuffer = makeRefPtr(m_remoteResourceCache.cachedImageBuffer(arguments.destinationImageBufferIdentifier));
+ RefPtr destinationImageBuffer = m_remoteResourceCache.cachedImageBuffer(arguments.destinationImageBufferIdentifier);
MESSAGE_CHECK(destinationImageBuffer, "Missing destination image buffer");
auto initialHandle = m_sharedDisplayListHandles.get(arguments.itemBufferIdentifier);
Modified: trunk/Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.cpp (282847 => 282848)
--- trunk/Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.cpp 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/NetworkProcess/IndexedDB/WebIDBServer.cpp 2021-09-21 23:03:37 UTC (rev 282848)
@@ -399,9 +399,9 @@
{
ASSERT(RunLoop::isMain());
- postTask([this, protectedThis = Ref { *this }, protectedConnection = makeRefPtr(connection), processIdentifier] {
+ postTask([this, protectedThis = Ref { *this }, protectedConnection = Ref { connection }, processIdentifier] {
auto[iter, isNewEntry] = m_connectionMap.ensure(protectedConnection->uniqueID(), [&] {
- return makeUnique<WebIDBConnectionToClient>(*protectedConnection, processIdentifier);
+ return makeUnique<WebIDBConnectionToClient>(protectedConnection.get(), processIdentifier);
});
ASSERT_UNUSED(isNewEntry, isNewEntry);
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (282847 => 282848)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2021-09-21 23:03:37 UTC (rev 282848)
@@ -754,7 +754,7 @@
networkDataTask->didNegotiateModernTLS(URL(URL(), makeString(String(protectionSpace.protocol), "://", String(protectionSpace.host), ':', protectionSpace.port)));
}
#if HAVE(CFNETWORK_NSURLSESSION_STRICTRUSTEVALUATE)
- auto decisionHandler = makeBlockPtr([weakSelf = WeakObjCPtr<WKNetworkSessionDelegate>(self), sessionCocoa = makeWeakPtr(sessionCocoa), completionHandler = makeBlockPtr(completionHandler), taskIdentifier, networkDataTask = makeRefPtr(networkDataTask), negotiatedLegacyTLS](NSURLAuthenticationChallenge *challenge, OSStatus trustResult) mutable {
+ auto decisionHandler = makeBlockPtr([weakSelf = WeakObjCPtr<WKNetworkSessionDelegate>(self), sessionCocoa = makeWeakPtr(sessionCocoa), completionHandler = makeBlockPtr(completionHandler), taskIdentifier, networkDataTask = RefPtr { networkDataTask }, negotiatedLegacyTLS](NSURLAuthenticationChallenge *challenge, OSStatus trustResult) mutable {
auto strongSelf = weakSelf.get();
if (!strongSelf)
return completionHandler(NSURLSessionAuthChallengeCancelAuthenticationChallenge, nil);
Modified: trunk/Source/WebKit/Platform/IPC/Connection.cpp (282847 => 282848)
--- trunk/Source/WebKit/Platform/IPC/Connection.cpp 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/Platform/IPC/Connection.cpp 2021-09-21 23:03:37 UTC (rev 282848)
@@ -1135,7 +1135,7 @@
m_dispatchMessagesTimer.startOneShot(0_s);
return;
}
- RunLoop::main().dispatch([this, protectedConnection = makeRefPtr(&m_connection)]() mutable {
+ RunLoop::main().dispatch([this, protectedConnection = RefPtr { &m_connection }]() mutable {
(protectedConnection.get()->*m_dispatchMessages)();
});
}
Modified: trunk/Source/WebKit/Shared/WebHitTestResultData.cpp (282847 => 282848)
--- trunk/Source/WebKit/Shared/WebHitTestResultData.cpp 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/Shared/WebHitTestResultData.cpp 2021-09-21 23:03:37 UTC (rev 282848)
@@ -93,7 +93,7 @@
}
}
- if (auto target = makeRefPtr(hitTestResult.innerNonSharedNode()); target && is<RenderImage>(target->renderer()))
+ if (auto target = RefPtr { hitTestResult.innerNonSharedNode() }; target && is<RenderImage>(target->renderer()))
imageBitmap = createShareableBitmap(*downcast<RenderImage>(target->renderer()));
}
Modified: trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaFormatReader.cpp (282847 => 282848)
--- trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaFormatReader.cpp 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/Shared/mac/MediaFormatReader/MediaFormatReader.cpp 2021-09-21 23:03:37 UTC (rev 282848)
@@ -139,7 +139,7 @@
}
if (!m_logger) {
- m_logger = makeRefPtr(Document::sharedLogger());
+ m_logger = &Document::sharedLogger();
m_logIdentifier = nextLogIdentifier();
}
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp (282847 => 282848)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp 2021-09-21 23:03:37 UTC (rev 282848)
@@ -2473,7 +2473,7 @@
webkitWindowPropertiesUpdateFromWebWindowFeatures(newWebView->priv->windowProperties.get(), windowFeatures);
- return makeRefPtr(getPage(newWebView));
+ return &getPage(newWebView);
}
void webkitWebViewReadyToShowPage(WebKitWebView* webView)
Modified: trunk/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp (282847 => 282848)
--- trunk/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/UIProcess/Automation/WebAutomationSession.cpp 2021-09-21 23:03:37 UTC (rev 282848)
@@ -415,7 +415,7 @@
if (!page)
ASYNC_FAIL_WITH_PREDEFINED_ERROR(WindowNotFound);
- exitFullscreenWindowForPage(*page, [this, protectedThis = Ref { *this }, callback = WTFMove(callback), page = makeRefPtr(page), width, height, x, y]() mutable {
+ exitFullscreenWindowForPage(*page, [this, protectedThis = Ref { *this }, callback = WTFMove(callback), page = RefPtr { page }, width, height, x, y]() mutable {
auto& webPage = *page;
this->restoreWindowForPage(webPage, [callback = WTFMove(callback), page = WTFMove(page), width, height, x, y]() mutable {
auto& webPage = *page;
@@ -563,7 +563,7 @@
if (!page)
ASYNC_FAIL_WITH_PREDEFINED_ERROR(WindowNotFound);
- exitFullscreenWindowForPage(*page, [this, protectedThis = Ref { *this }, callback = WTFMove(callback), page = makeRefPtr(page)]() mutable {
+ exitFullscreenWindowForPage(*page, [this, protectedThis = Ref { *this }, callback = WTFMove(callback), page = RefPtr { page }]() mutable {
auto& webPage = *page;
restoreWindowForPage(webPage, [this, callback = WTFMove(callback), page = WTFMove(page)]() mutable {
maximizeWindowForPage(*page, [callback = WTFMove(callback)]() {
@@ -579,7 +579,7 @@
if (!page)
ASYNC_FAIL_WITH_PREDEFINED_ERROR(WindowNotFound);
- exitFullscreenWindowForPage(*page, [protectedThis = Ref { *this }, callback = WTFMove(callback), page = makeRefPtr(page)]() mutable {
+ exitFullscreenWindowForPage(*page, [protectedThis = Ref { *this }, callback = WTFMove(callback), page = RefPtr { page }]() mutable {
protectedThis->hideWindowForPage(*page, [callback = WTFMove(callback)]() mutable {
callback->sendSuccess();
});
Modified: trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm (282847 => 282848)
--- trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm 2021-09-21 23:03:37 UTC (rev 282848)
@@ -1029,7 +1029,7 @@
auto checker = CompletionHandlerCallChecker::create(delegate.get(), @selector(webView:runOpenPanelWithParameters:initiatedByFrame:completionHandler:));
- [delegate webView:m_uiDelegate->m_webView.get().get() runOpenPanelWithParameters:wrapper(*openPanelParameters) initiatedByFrame:wrapper(frame) completionHandler:makeBlockPtr([checker = WTFMove(checker), openPanelParameters = makeRef(*openPanelParameters), listener = makeRefPtr(listener)] (NSArray *URLs) mutable {
+ [delegate webView:m_uiDelegate->m_webView.get().get() runOpenPanelWithParameters:wrapper(*openPanelParameters) initiatedByFrame:wrapper(frame) completionHandler:makeBlockPtr([checker = WTFMove(checker), openPanelParameters = Ref { *openPanelParameters }, listener = RefPtr { listener }] (NSArray *URLs) mutable {
if (checker->completionHandlerHasBeenCalled())
return;
checker->didCallCompletionHandler();
@@ -1465,7 +1465,7 @@
}
auto checker = CompletionHandlerCallChecker::create(delegate.get(), @selector(_webViewDidRequestPointerLock:completionHandler:));
- [static_cast<id <WKUIDelegatePrivate>>(delegate) _webViewDidRequestPointerLock:m_uiDelegate->m_webView.get().get() completionHandler:makeBlockPtr([checker = WTFMove(checker), page = makeRefPtr(page)] (BOOL allow) {
+ [static_cast<id <WKUIDelegatePrivate>>(delegate) _webViewDidRequestPointerLock:m_uiDelegate->m_webView.get().get() completionHandler:makeBlockPtr([checker = WTFMove(checker), page = RefPtr { page }] (BOOL allow) {
if (checker->completionHandlerHasBeenCalled())
return;
checker->didCallCompletionHandler();
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm (282847 => 282848)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm 2021-09-21 23:03:37 UTC (rev 282848)
@@ -534,7 +534,7 @@
// that may result in other frameworks trying to install commit handlers for the same phase, which is not allowed.
// So, dispatch_async here; we only care that the activity state change doesn't apply until after the active commit is complete.
WorkQueue::main().dispatch([weakThis] {
- auto protectedThis = makeRefPtr(weakThis.get());
+ RefPtr protectedThis { weakThis.get() };
if (!protectedThis)
return;
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (282847 => 282848)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2021-09-21 23:03:37 UTC (rev 282848)
@@ -159,7 +159,7 @@
@implementation WKProcessPoolWeakObserver (Direct)
- (RefPtr<WebKit::WebProcessPool>)pool
{
- return makeRefPtr(m_weakPtr.get());
+ return m_weakPtr.get();
}
@end
Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp (282847 => 282848)
--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2021-09-21 23:03:37 UTC (rev 282848)
@@ -470,7 +470,7 @@
void NetworkProcessProxy::terminateUnresponsiveServiceWorkerProcesses(WebCore::ProcessIdentifier processIdentifier)
{
- if (auto process = makeRefPtr(WebProcessProxy::processForIdentifier(processIdentifier))) {
+ if (RefPtr process = WebProcessProxy::processForIdentifier(processIdentifier)) {
process->disableServiceWorkers();
process->requestTermination(ProcessTerminationReason::ExceededCPULimit);
}
Modified: trunk/Source/WebKit/UIProcess/WebContextMenuProxy.cpp (282847 => 282848)
--- trunk/Source/WebKit/UIProcess/WebContextMenuProxy.cpp 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/UIProcess/WebContextMenuProxy.cpp 2021-09-21 23:03:37 UTC (rev 282848)
@@ -61,7 +61,7 @@
{
m_contextMenuListener = nullptr;
- auto page = makeRefPtr(this->page());
+ RefPtr page = this->page();
if (!page)
return;
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (282847 => 282848)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-09-21 23:03:37 UTC (rev 282848)
@@ -3203,7 +3203,7 @@
++m_handlingPreventableTouchEndCount;
sendWithAsyncReply(Messages::EventDispatcher::TouchEvent(m_webPageID, event), [this, weakThis = makeWeakPtr(*this), event] (bool handled) {
- auto protectedThis = makeRefPtr(weakThis.get());
+ RefPtr protectedThis { weakThis.get() };
if (!protectedThis)
return;
@@ -4634,7 +4634,7 @@
{
PageClientProtector protector(pageClient());
- auto frame = makeRefPtr(process->webFrame(frameID));
+ RefPtr frame = process->webFrame(frameID);
MESSAGE_CHECK(process, frame);
MESSAGE_CHECK_URL(process, url);
@@ -5420,7 +5420,7 @@
auto listener = makeRef(frame.setUpPolicyListenerProxy([this, protectedThis = Ref { *this }, frame = makeRef(frame), sender = WTFMove(sender), navigation, navigationAction, frameInfo, userDataObject = process->transformHandlesToObjects(userData.object()).get()] (PolicyAction policyAction, API::WebsitePolicies* policies, ProcessSwapRequestedByClient processSwapRequestedByClient, RefPtr<SafeBrowsingWarning>&& safeBrowsingWarning, std::optional<NavigatingToAppBoundDomain> isAppBoundDomain) mutable {
WEBPAGEPROXY_RELEASE_LOG(Loading, "decidePolicyForNavigationAction: listener called: frameID=%llu, navigationID=%llu, policyAction=%u, safeBrowsingWarning=%d, isAppBoundDomain=%d", frame->frameID().toUInt64(), navigation ? navigation->navigationID() : 0, (unsigned)policyAction, !!safeBrowsingWarning, !!isAppBoundDomain);
- auto completionHandler = [this, protectedThis, frame, sender = WTFMove(sender), navigation, navigationAction = WTFMove(navigationAction), processSwapRequestedByClient, policies = makeRefPtr(policies)] (PolicyAction policyAction) mutable {
+ auto completionHandler = [this, protectedThis, frame, sender = WTFMove(sender), navigation, navigationAction = WTFMove(navigationAction), processSwapRequestedByClient, policies = RefPtr { policies }] (PolicyAction policyAction) mutable {
if (frame->isMainFrame()) {
if (!policies) {
if (auto* defaultPolicies = m_configuration->defaultWebsitePolicies())
@@ -5921,13 +5921,13 @@
void WebPageProxy::runModalJavaScriptDialog(RefPtr<WebFrameProxy>&& frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler<void(WebPageProxy&, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler<void()>&&)>&& runDialogCallback)
{
pageClient().runModalJavaScriptDialog([weakThis = makeWeakPtr(*this), frameInfo = WTFMove(frameInfo), frame = WTFMove(frame), message, runDialogCallback = WTFMove(runDialogCallback)]() mutable {
- auto protectedThis = makeRefPtr(weakThis.get());
+ RefPtr protectedThis { weakThis.get() };
if (!protectedThis)
return;
protectedThis->m_isRunningModalJavaScriptDialog = true;
runDialogCallback(*protectedThis, frame.get(), WTFMove(frameInfo), message, [weakThis = WTFMove(weakThis)]() mutable {
- if (auto protectedThis = makeRefPtr(weakThis.get()))
+ if (RefPtr protectedThis = weakThis.get())
protectedThis->m_isRunningModalJavaScriptDialog = false;
});
});
@@ -5935,7 +5935,7 @@
void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& frameInfo, const String& message, Messages::WebPageProxy::RunJavaScriptAlert::DelayedReply&& reply)
{
- auto frame = makeRefPtr(m_process->webFrame(frameID));
+ RefPtr frame = m_process->webFrame(frameID);
MESSAGE_CHECK(m_process, frame);
exitFullscreenImmediately();
@@ -5958,7 +5958,7 @@
void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&& frameInfo, const String& message, Messages::WebPageProxy::RunJavaScriptConfirm::DelayedReply&& reply)
{
- auto frame = makeRefPtr(m_process->webFrame(frameID));
+ RefPtr frame = m_process->webFrame(frameID);
MESSAGE_CHECK(m_process, frame);
exitFullscreenImmediately();
@@ -5981,7 +5981,7 @@
void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&& frameInfo, const String& message, const String& defaultValue, Messages::WebPageProxy::RunJavaScriptPrompt::DelayedReply&& reply)
{
- auto frame = makeRefPtr(m_process->webFrame(frameID));
+ RefPtr frame = m_process->webFrame(frameID);
MESSAGE_CHECK(m_process, frame);
exitFullscreenImmediately();
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (282847 => 282848)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2021-09-21 23:03:37 UTC (rev 282848)
@@ -1805,7 +1805,7 @@
void WebProcessPool::processForNavigation(WebPageProxy& page, const API::Navigation& navigation, Ref<WebProcessProxy>&& sourceProcess, const URL& sourceURL, ProcessSwapRequestedByClient processSwapRequestedByClient, Ref<WebsiteDataStore>&& dataStore, CompletionHandler<void(Ref<WebProcessProxy>&&, SuspendedPageProxy*, const String&)>&& completionHandler)
{
- processForNavigationInternal(page, navigation, sourceProcess.copyRef(), sourceURL, processSwapRequestedByClient, WTFMove(dataStore), [this, page = makeRefPtr(page), navigation = makeRef(navigation), sourceProcess = sourceProcess.copyRef(), sourceURL, processSwapRequestedByClient, completionHandler = WTFMove(completionHandler)](Ref<WebProcessProxy>&& process, SuspendedPageProxy* suspendedPage, const String& reason) mutable {
+ processForNavigationInternal(page, navigation, sourceProcess.copyRef(), sourceURL, processSwapRequestedByClient, WTFMove(dataStore), [this, page = Ref { page }, navigation = makeRef(navigation), sourceProcess = sourceProcess.copyRef(), sourceURL, processSwapRequestedByClient, completionHandler = WTFMove(completionHandler)](Ref<WebProcessProxy>&& process, SuspendedPageProxy* suspendedPage, const String& reason) mutable {
// We are process-swapping so automatic process prewarming would be beneficial if the client has not explicitly enabled / disabled it.
bool doingAnAutomaticProcessSwap = processSwapRequestedByClient == ProcessSwapRequestedByClient::No && process.ptr() != sourceProcess.ptr();
if (doingAnAutomaticProcessSwap && !configuration().wasAutomaticProcessWarmingSetByClient() && !configuration().clientWouldBenefitFromAutomaticProcessPrewarming()) {
Modified: trunk/Source/WebKit/UIProcess/ios/ViewGestureControllerIOS.mm (282847 => 282848)
--- trunk/Source/WebKit/UIProcess/ios/ViewGestureControllerIOS.mm 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/UIProcess/ios/ViewGestureControllerIOS.mm 2021-09-21 23:03:37 UTC (rev 282848)
@@ -183,7 +183,7 @@
m_webPageProxyForBackForwardListForCurrentSwipe = alternateBackForwardListSourcePage ? alternateBackForwardListSourcePage.get() : &m_webPageProxy;
auto& backForwardList = m_webPageProxyForBackForwardListForCurrentSwipe->backForwardList();
- auto targetItem = makeRefPtr(direction == SwipeDirection::Back ? backForwardList.backItem() : backForwardList.forwardItem());
+ RefPtr targetItem = direction == SwipeDirection::Back ? backForwardList.backItem() : backForwardList.forwardItem();
if (!targetItem) {
RELEASE_LOG_ERROR(ViewGestures, "Failed to find %s item when beginning swipe.", direction == SwipeDirection::Back ? "back" : "forward");
didEndGesture();
Modified: trunk/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm (282847 => 282848)
--- trunk/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm 2021-09-21 23:03:37 UTC (rev 282848)
@@ -546,7 +546,7 @@
[menu setItemArray:[sparseMenuItems allObjects]];
- auto page = makeRefPtr(weakPage.get());
+ RefPtr page { weakPage.get() };
if (page && imageBitmap) {
#if ENABLE(IMAGE_ANALYSIS)
protectedThis->insertOrUpdateQuickLookImageItem(imageURL, imageBitmap.releaseNonNull(), WTFMove(quickLookItemToInsertIfNeeded), shouldUpdateQuickLookItemTitle);
@@ -575,7 +575,7 @@
auto page = makeRef(*this->page());
if (quickLookItemToInsertIfNeeded) {
page->computeHasImageAnalysisResults(imageURL, imageBitmap.get(), ImageAnalysisType::VisualSearch, [weakThis = makeWeakPtr(*this), quickLookItemToInsertIfNeeded = WTFMove(*quickLookItemToInsertIfNeeded)] (bool hasVisualSearchResults) mutable {
- if (auto protectedThis = makeRefPtr(weakThis.get()); protectedThis && hasVisualSearchResults) {
+ if (RefPtr protectedThis = weakThis.get(); protectedThis && hasVisualSearchResults) {
protectedThis->m_quickLookPreviewActivity = QuickLookPreviewActivity::VisualSearch;
[protectedThis->m_menu addItem:NSMenuItem.separatorItem];
[protectedThis->m_menu addItem:createMenuActionItem(quickLookItemToInsertIfNeeded).get()];
@@ -586,11 +586,11 @@
if (shouldUpdateQuickLookItemTitle) {
page->computeHasImageAnalysisResults(imageURL, imageBitmap.get(), ImageAnalysisType::VisualSearch, [weakThis = makeWeakPtr(*this), weakPage = makeWeakPtr(page.get()), imageURL, imageBitmap = WTFMove(imageBitmap)] (bool hasVisualSearchResults) mutable {
- auto protectedThis = makeRefPtr(weakThis.get());
+ RefPtr protectedThis { weakThis.get() };
if (!protectedThis)
return;
- auto page = makeRefPtr(weakPage.get());
+ RefPtr page { weakPage.get() };
if (!page)
return;
@@ -601,11 +601,11 @@
}
page->computeHasImageAnalysisResults(imageURL, imageBitmap.get(), ImageAnalysisType::Text, [weakThis = WTFMove(weakThis), weakPage] (bool hasText) mutable {
- auto protectedThis = makeRefPtr(weakThis.get());
+ RefPtr protectedThis { weakThis.get() };
if (!protectedThis)
return;
- if (auto page = makeRefPtr(weakPage.get()); page && hasText)
+ if (RefPtr page = weakPage.get(); page && hasText)
protectedThis->updateQuickLookContextMenuItemTitle(contextMenuItemTagQuickLookImageForTextSelection());
});
});
Modified: trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp (282847 => 282848)
--- trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp 2021-09-21 23:03:37 UTC (rev 282848)
@@ -119,7 +119,7 @@
RemoteRenderingBackendProxy::DidReceiveBackendCreationResult RemoteRenderingBackendProxy::waitForDidCreateImageBufferBackend()
{
- auto connection = makeRefPtr(messageSenderConnection());
+ RefPtr connection = messageSenderConnection();
if (!connection->waitForAndDispatchImmediately<Messages::RemoteRenderingBackendProxy::DidCreateImageBufferBackend>(renderingBackendIdentifier(), 1_s, IPC::WaitForOption::InterruptWaitingIfSyncMessageArrives))
return DidReceiveBackendCreationResult::TimeoutOrIPCFailure;
return DidReceiveBackendCreationResult::ReceivedAnyResponse;
@@ -127,7 +127,7 @@
bool RemoteRenderingBackendProxy::waitForDidFlush()
{
- auto connection = makeRefPtr(messageSenderConnection());
+ RefPtr connection = messageSenderConnection();
return connection->waitForAndDispatchImmediately<Messages::RemoteRenderingBackendProxy::DidFlush>(renderingBackendIdentifier(), 1_s, IPC::WaitForOption::InterruptWaitingIfSyncMessageArrives);
}
@@ -397,7 +397,7 @@
auto leastRecentlyUsedIdentifier = m_identifiersOfReusableHandles.first();
if (leastRecentlyUsedIdentifier != mostRecentlyUsedHandle->identifier()) {
- auto handle = makeRefPtr(m_sharedDisplayListHandles.get(leastRecentlyUsedIdentifier));
+ RefPtr handle = m_sharedDisplayListHandles.get(leastRecentlyUsedIdentifier);
if (handle->moveWritableOffsetToStartIfPossible() && handle->availableCapacity() >= capacity)
return handle;
}
Modified: trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp (282847 => 282848)
--- trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp 2021-09-21 23:03:37 UTC (rev 282848)
@@ -140,7 +140,7 @@
void MediaPlayerPrivateRemote::prepareForPlayback(bool privateMode, MediaPlayer::Preload preload, bool preservesPitch, bool prepare)
{
- auto player = makeRefPtr(m_player.get());
+ RefPtr player = m_player.get();
if (!player)
return;
@@ -154,7 +154,7 @@
if (!inlineLayerHostingContextId)
return;
- auto player = makeRefPtr(m_player.get());
+ RefPtr player = m_player.get();
if (!player)
return;
@@ -192,7 +192,7 @@
if (!createExtension()) {
WTFLogAlways("Unable to create sandbox extension handle for GPUProcess url.\n");
m_cachedState.networkState = MediaPlayer::NetworkState::FormatError;
- if (auto player = makeRefPtr(m_player.get()))
+ if (RefPtr player = m_player.get())
player->networkStateChanged();
return;
}
@@ -204,7 +204,7 @@
if (!weakThis)
return;
- auto player = makeRefPtr(m_player.get());
+ RefPtr player = m_player.get();
if (!player)
return;
@@ -337,7 +337,7 @@
void MediaPlayerPrivateRemote::networkStateChanged(RemoteMediaPlayerState&& state)
{
updateCachedState(WTFMove(state));
- if (auto player = makeRefPtr(m_player.get()))
+ if (RefPtr player = m_player.get())
player->networkStateChanged();
}
@@ -344,7 +344,7 @@
void MediaPlayerPrivateRemote::setReadyState(MediaPlayer::ReadyState readyState)
{
m_cachedState.readyState = readyState;
- if (auto player = makeRefPtr(m_player.get()))
+ if (RefPtr player = m_player.get())
player->readyStateChanged();
}
@@ -351,7 +351,7 @@
void MediaPlayerPrivateRemote::readyStateChanged(RemoteMediaPlayerState&& state)
{
updateCachedState(WTFMove(state));
- if (auto player = makeRefPtr(m_player.get())) {
+ if (RefPtr player = m_player.get()) {
player->readyStateChanged();
bool renderingCanBeAccelerated = player->renderingCanBeAccelerated();
if (m_renderingCanBeAccelerated != renderingCanBeAccelerated)
@@ -362,7 +362,7 @@
void MediaPlayerPrivateRemote::volumeChanged(double volume)
{
m_volume = volume;
- if (auto player = makeRefPtr(m_player.get()))
+ if (RefPtr player = m_player.get())
player->volumeChanged(volume);
}
@@ -369,7 +369,7 @@
void MediaPlayerPrivateRemote::muteChanged(bool muted)
{
m_muted = muted;
- if (auto player = makeRefPtr(m_player.get()))
+ if (RefPtr player = m_player.get())
player->muteChanged(muted);
}
@@ -377,7 +377,7 @@
{
m_seeking = false;
updateCachedState(WTFMove(state));
- if (auto player = makeRefPtr(m_player.get()))
+ if (RefPtr player = m_player.get())
player->timeChanged();
}
@@ -384,7 +384,7 @@
void MediaPlayerPrivateRemote::durationChanged(RemoteMediaPlayerState&& state)
{
updateCachedState(WTFMove(state));
- if (auto player = makeRefPtr(m_player.get()))
+ if (RefPtr player = m_player.get())
player->durationChanged();
}
@@ -391,7 +391,7 @@
void MediaPlayerPrivateRemote::rateChanged(double rate)
{
m_rate = rate;
- if (auto player = makeRefPtr(m_player.get()))
+ if (RefPtr player = m_player.get())
player->rateChanged();
}
@@ -400,7 +400,7 @@
m_cachedState.paused = paused;
m_cachedMediaTime = mediaTime;
m_cachedMediaTimeQueryTime = wallTime;
- if (auto player = makeRefPtr(m_player.get()))
+ if (RefPtr player = m_player.get())
player->playbackStateChanged();
}
@@ -407,7 +407,7 @@
void MediaPlayerPrivateRemote::engineFailedToLoad(long platformErrorCode)
{
m_platformErrorCode = platformErrorCode;
- if (auto player = makeRefPtr(m_player.get()))
+ if (RefPtr player = m_player.get())
player->remoteEngineFailedToLoad();
}
@@ -414,7 +414,7 @@
void MediaPlayerPrivateRemote::characteristicChanged(RemoteMediaPlayerState&& state)
{
updateCachedState(WTFMove(state));
- if (auto player = makeRefPtr(m_player.get()))
+ if (RefPtr player = m_player.get())
player->characteristicChanged();
}
@@ -421,7 +421,7 @@
void MediaPlayerPrivateRemote::sizeChanged(WebCore::FloatSize naturalSize)
{
m_cachedState.naturalSize = naturalSize;
- if (auto player = makeRefPtr(m_player.get()))
+ if (RefPtr player = m_player.get())
player->sizeChanged();
}
@@ -435,7 +435,7 @@
void MediaPlayerPrivateRemote::firstVideoFrameAvailable()
{
INFO_LOG(LOGIDENTIFIER);
- if (auto player = makeRefPtr(m_player.get()))
+ if (RefPtr player = m_player.get())
player->firstVideoFrameAvailable();
}
@@ -442,7 +442,7 @@
void MediaPlayerPrivateRemote::renderingModeChanged()
{
INFO_LOG(LOGIDENTIFIER);
- if (auto player = makeRefPtr(m_player.get()))
+ if (RefPtr player = m_player.get())
player->renderingModeChanged();
}
@@ -473,7 +473,7 @@
void MediaPlayerPrivateRemote::acceleratedRenderingStateChanged()
{
- if (auto player = makeRefPtr(m_player.get())) {
+ if (RefPtr player = m_player.get()) {
m_renderingCanBeAccelerated = player->renderingCanBeAccelerated();
connection().send(Messages::RemoteMediaPlayerProxy::AcceleratedRenderingStateChanged(m_renderingCanBeAccelerated), m_id);
}
@@ -573,7 +573,7 @@
return;
#endif
- if (auto player = makeRefPtr(m_player.get()))
+ if (RefPtr player = m_player.get())
m_player->addAudioTrack(addResult.iterator->value);
}
@@ -582,7 +582,7 @@
ASSERT(m_audioTracks.contains(identifier));
if (auto* track = m_audioTracks.get(identifier)) {
- if (auto player = makeRefPtr(m_player.get()))
+ if (RefPtr player = m_player.get())
player->removeAudioTrack(*track);
m_audioTracks.remove(identifier);
}
@@ -611,7 +611,7 @@
return;
#endif
- if (auto player = makeRefPtr(m_player.get()))
+ if (RefPtr player = m_player.get())
player->addTextTrack(addResult.iterator->value);
}
@@ -620,7 +620,7 @@
ASSERT(m_textTracks.contains(identifier));
if (auto* track = m_textTracks.get(identifier)) {
- if (auto player = makeRefPtr(m_player.get()))
+ if (RefPtr player = m_player.get())
player->removeTextTrack(*track);
m_textTracks.remove(identifier);
}
@@ -731,7 +731,7 @@
return;
#endif
- if (auto player = makeRefPtr(m_player.get()))
+ if (RefPtr player = m_player.get())
player->addVideoTrack(addResult.iterator->value);
}
@@ -740,7 +740,7 @@
ASSERT(m_videoTracks.contains(identifier));
if (auto* track = m_videoTracks.get(identifier)) {
- if (auto player = makeRefPtr(m_player.get()))
+ if (RefPtr player = m_player.get())
player->removeVideoTrack(*track);
m_videoTracks.remove(identifier);
}
@@ -763,7 +763,7 @@
if (!weakThis)
return;
- auto player = makeRefPtr(m_player.get());
+ RefPtr player = m_player.get();
if (!player)
return;
@@ -779,7 +779,7 @@
if (!weakThis)
return;
- auto player = makeRefPtr(m_player.get());
+ RefPtr player = m_player.get();
if (!player)
return;
@@ -796,7 +796,7 @@
if (!weakThis)
return;
- auto player = makeRefPtr(m_player.get());
+ RefPtr player = m_player.get();
if (!player)
return;
@@ -1022,7 +1022,7 @@
void MediaPlayerPrivateRemote::currentPlaybackTargetIsWirelessChanged(bool isCurrentPlaybackTargetWireless)
{
m_isCurrentPlaybackTargetWireless = isCurrentPlaybackTargetWireless;
- if (auto player = makeRefPtr(m_player.get()))
+ if (RefPtr player = m_player.get())
player->currentPlaybackTargetIsWirelessChanged(isCurrentPlaybackTargetWireless);
}
@@ -1156,7 +1156,7 @@
void MediaPlayerPrivateRemote::mediaPlayerKeyNeeded(IPC::DataReference&& message)
{
- if (auto player = makeRefPtr(m_player.get()))
+ if (RefPtr player = m_player.get())
player->keyNeeded(Uint8Array::create(message.data(), message.size()).ptr());
}
#endif
@@ -1183,7 +1183,7 @@
void MediaPlayerPrivateRemote::waitingForKeyChanged(bool waitingForKey)
{
m_waitingForKey = waitingForKey;
- if (auto player = makeRefPtr(m_player.get()))
+ if (RefPtr player = m_player.get())
player->waitingForKeyChanged();
}
@@ -1190,7 +1190,7 @@
void MediaPlayerPrivateRemote::initializationDataEncountered(const String& initDataType, IPC::DataReference&& initData)
{
auto initDataBuffer = ArrayBuffer::create(initData.data(), initData.size());
- if (auto player = makeRefPtr(m_player.get()))
+ if (RefPtr player = m_player.get())
player->initializationDataEncountered(initDataType, WTFMove(initDataBuffer));
}
@@ -1381,13 +1381,13 @@
void MediaPlayerPrivateRemote::resourceNotSupported()
{
- if (auto player = makeRefPtr(m_player.get()))
+ if (RefPtr player = m_player.get())
player->resourceNotSupported();
}
void MediaPlayerPrivateRemote::activeSourceBuffersChanged()
{
- if (auto player = makeRefPtr(m_player.get()))
+ if (RefPtr player = m_player.get())
player->activeSourceBuffersChanged();
}
@@ -1394,7 +1394,7 @@
#if PLATFORM(IOS_FAMILY)
void MediaPlayerPrivateRemote::getRawCookies(const URL& url, WebCore::MediaPlayerClient::GetRawCookiesCallback&& completionHandler) const
{
- if (auto player = makeRefPtr(m_player.get()))
+ if (RefPtr player = m_player.get())
player->getRawCookies(url, WTFMove(completionHandler));
}
#endif
Modified: trunk/Source/WebKit/WebProcess/GPU/webrtc/MediaRecorderPrivate.cpp (282847 => 282848)
--- trunk/Source/WebKit/WebProcess/GPU/webrtc/MediaRecorderPrivate.cpp 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/WebProcess/GPU/webrtc/MediaRecorderPrivate.cpp 2021-09-21 23:03:37 UTC (rev 282848)
@@ -65,7 +65,7 @@
if (selectedTracks.audioTrack)
m_ringBuffer = makeUnique<CARingBuffer>(makeUniqueRef<SharedRingBufferStorage>(std::bind(&MediaRecorderPrivate::storageChanged, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)));
- m_connection->sendWithAsyncReply(Messages::RemoteMediaRecorderManager::CreateRecorder { m_identifier, !!selectedTracks.audioTrack, !!selectedTracks.videoTrack, m_options }, [this, weakThis = makeWeakPtr(this), audioTrack = makeRefPtr(selectedTracks.audioTrack), videoTrack = makeRefPtr(selectedTracks.videoTrack), callback = WTFMove(callback)](auto&& exception, String&& mimeType, unsigned audioBitRate, unsigned videoBitRate) mutable {
+ m_connection->sendWithAsyncReply(Messages::RemoteMediaRecorderManager::CreateRecorder { m_identifier, !!selectedTracks.audioTrack, !!selectedTracks.videoTrack, m_options }, [this, weakThis = makeWeakPtr(this), audioTrack = RefPtr { selectedTracks.audioTrack }, videoTrack = RefPtr { selectedTracks.videoTrack }, callback = WTFMove(callback)](auto&& exception, String&& mimeType, unsigned audioBitRate, unsigned videoBitRate) mutable {
if (!weakThis) {
callback(Exception { InvalidStateError }, 0, 0);
return;
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp (282847 => 282848)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp 2021-09-21 23:03:37 UTC (rev 282848)
@@ -117,9 +117,9 @@
{
auto range = makeSimpleRange(m_range);
- auto document = makeRef(range.start.document());
+ Ref document = range.start.document();
- auto frame = makeRefPtr(document->frame());
+ RefPtr frame = document->frame();
if (!frame)
return nullptr;
Modified: trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp (282847 => 282848)
--- trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp 2021-09-21 23:03:37 UTC (rev 282848)
@@ -236,8 +236,8 @@
#if ENABLE(SERVICE_WORKER)
if (!resourceLoader.options().serviceWorkerRegistrationIdentifier && InspectorInstrumentationWebKit::shouldInterceptRequest(resourceLoader.frame(), resourceLoader.request())) {
- InspectorInstrumentationWebKit::interceptRequest(resourceLoader, [this, protectedResourceLoader = makeRefPtr(&resourceLoader), trackingParameters, shouldClearReferrerOnHTTPSToHTTPRedirect, resource](const ResourceRequest& request) {
- scheduleLoadFromNetworkProcess(*protectedResourceLoader, request, trackingParameters, shouldClearReferrerOnHTTPSToHTTPRedirect, maximumBufferingTime(resource));
+ InspectorInstrumentationWebKit::interceptRequest(resourceLoader, [this, protectedResourceLoader = Ref { resourceLoader }, trackingParameters, shouldClearReferrerOnHTTPSToHTTPRedirect, resource](const ResourceRequest& request) {
+ scheduleLoadFromNetworkProcess(protectedResourceLoader, request, trackingParameters, shouldClearReferrerOnHTTPSToHTTPRedirect, maximumBufferingTime(resource));
});
return;
}
@@ -406,7 +406,7 @@
if (resourceLoader.options().mode == FetchOptions::Mode::Navigate) {
Vector<RefPtr<SecurityOrigin>> frameAncestorOrigins;
for (auto* frame = resourceLoader.frame()->tree().parent(); frame; frame = frame->tree().parent())
- frameAncestorOrigins.append(makeRefPtr(frame->document()->securityOrigin()));
+ frameAncestorOrigins.append(&frame->document()->securityOrigin());
loadParameters.frameAncestorOrigins = WTFMove(frameAncestorOrigins);
}
Modified: trunk/Source/WebKit/WebProcess/Notifications/WebNotificationManager.cpp (282847 => 282848)
--- trunk/Source/WebKit/WebProcess/Notifications/WebNotificationManager.cpp 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/WebProcess/Notifications/WebNotificationManager.cpp 2021-09-21 23:03:37 UTC (rev 282848)
@@ -203,7 +203,7 @@
void WebNotificationManager::didDestroyNotification(Notification* notification, WebPage* page)
{
#if ENABLE(NOTIFICATIONS)
- auto protectedNotification = makeRefPtr(notification);
+ RefPtr protectedNotification { notification };
uint64_t notificationID = m_notificationMap.take(notification);
if (!notificationID)
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (282847 => 282848)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2021-09-21 23:03:37 UTC (rev 282848)
@@ -187,7 +187,7 @@
void WebDragClient::declareAndWriteDragImage(const String& pasteboardName, Element& element, const URL& url, const String& label, Frame*)
{
- if (auto frame = makeRefPtr(element.document().frame()))
+ if (RefPtr frame = element.document().frame())
frame->editor().writeImageToPasteboard(*Pasteboard::createForDragAndDrop(PagePasteboardContext::create(frame->pageID())), element, url, label);
}
Modified: trunk/Source/WebKit/WebProcess/WebPage/FindController.cpp (282847 => 282848)
--- trunk/Source/WebKit/WebProcess/WebPage/FindController.cpp 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/WebProcess/WebPage/FindController.cpp 2021-09-21 23:03:37 UTC (rev 282848)
@@ -295,7 +295,7 @@
return;
bool found = !m_findMatches.isEmpty();
- m_webPage->drawingArea()->dispatchAfterEnsuringUpdatedScrollPosition([protectedWebPage = makeRefPtr(m_webPage), found, string, options, maxMatchCount] () {
+ m_webPage->drawingArea()->dispatchAfterEnsuringUpdatedScrollPosition([protectedWebPage = RefPtr { m_webPage }, found, string, options, maxMatchCount] () {
protectedWebPage->findController().updateFindUIAfterPageScroll(found, string, options, maxMatchCount, DidWrap::No, FindUIOriginator::FindStringMatches);
});
}
Modified: trunk/Source/WebKit/WebProcess/WebPage/IPCTestingAPI.cpp (282847 => 282848)
--- trunk/Source/WebKit/WebProcess/WebPage/IPCTestingAPI.cpp 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/WebProcess/WebPage/IPCTestingAPI.cpp 2021-09-21 23:03:37 UTC (rev 282848)
@@ -285,7 +285,7 @@
{
auto* globalObject = toJS(context);
JSC::JSLockHolder lock(globalObject->vm());
- auto jsIPCSemaphore = makeRefPtr(toWrapped(context, thisObject));
+ RefPtr jsIPCSemaphore = toWrapped(context, thisObject);
if (!jsIPCSemaphore) {
*exception = createTypeError(context, "Wrong type"_s);
return JSValueMakeUndefined(context);
@@ -300,7 +300,7 @@
{
auto* globalObject = toJS(context);
JSC::JSLockHolder lock(globalObject->vm());
- auto jsIPCSemaphore = makeRefPtr(toWrapped(context, thisObject));
+ RefPtr jsIPCSemaphore = toWrapped(context, thisObject);
if (!jsIPCSemaphore) {
*exception = createTypeError(context, "Wrong type"_s);
return JSValueMakeUndefined(context);
@@ -396,7 +396,7 @@
JSValueRef JSSharedMemory::readBytes(JSContextRef context, JSObjectRef, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
{
- auto jsSharedMemory = makeRefPtr(toWrapped(context, thisObject));
+ RefPtr jsSharedMemory = toWrapped(context, thisObject);
if (!jsSharedMemory) {
*exception = createTypeError(context, "Wrong type"_s);
return JSValueMakeUndefined(context);
@@ -474,7 +474,7 @@
JSValueRef JSSharedMemory::writeBytes(JSContextRef context, JSObjectRef, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
{
- auto jsSharedMemory = makeRefPtr(toWrapped(context, thisObject));
+ RefPtr jsSharedMemory = toWrapped(context, thisObject);
if (!jsSharedMemory) {
*exception = createTypeError(context, "Wrong type"_s);
return JSValueMakeUndefined(context);
@@ -622,7 +622,7 @@
{
auto* globalObject = toJS(context);
JSC::JSLockHolder lock(globalObject->vm());
- auto jsIPC = makeRefPtr(toWrapped(context, thisObject));
+ RefPtr jsIPC = toWrapped(context, thisObject);
if (!jsIPC) {
*exception = createTypeError(context, "Wrong type"_s);
return;
@@ -764,7 +764,7 @@
auto jsSemaphore = jsObject->get(globalObject, JSC::Identifier::fromString(globalObject->vm(), "semaphore"_s));
if (scope.exception())
return false;
- auto semaphoreObject = makeRefPtr(JSIPCSemaphore::toWrapped(toRef(globalObject), toRef(jsSemaphore)));
+ RefPtr semaphoreObject = JSIPCSemaphore::toWrapped(toRef(globalObject), toRef(jsSemaphore));
if (!semaphoreObject)
return false;
@@ -789,7 +789,7 @@
auto jsSharedMemoryValue = jsObject->get(globalObject, JSC::Identifier::fromString(globalObject->vm(), "value"_s));
if (scope.exception())
return false;
- auto jsSharedMemory = makeRefPtr(JSSharedMemory::toWrapped(toRef(globalObject), toRef(jsSharedMemoryValue)));
+ RefPtr jsSharedMemory = JSSharedMemory::toWrapped(toRef(globalObject), toRef(jsSharedMemoryValue));
if (!jsSharedMemory)
return false;
@@ -823,7 +823,7 @@
static bool encodeSemaphore(IPC::Encoder& encoder, JSC::JSGlobalObject* globalObject, JSC::JSValue jsValue, JSC::CatchScope& scope)
{
- auto jsIPCSemaphore = makeRefPtr(JSIPCSemaphore::toWrapped(toRef(globalObject), toRef(jsValue)));
+ RefPtr jsIPCSemaphore = JSIPCSemaphore::toWrapped(toRef(globalObject), toRef(jsValue));
if (!jsIPCSemaphore)
return false;
@@ -962,7 +962,7 @@
}
if (type == "FrameInfoData") {
- auto webFrame = makeRefPtr(jsIPC.webFrame());
+ RefPtr webFrame = jsIPC.webFrame();
if (!webFrame) {
*exception = createTypeError(context, "Failed to get the frame"_s);
return false;
@@ -1114,7 +1114,7 @@
{
auto* globalObject = toJS(context);
JSC::JSLockHolder lock(globalObject->vm());
- auto jsIPC = makeRefPtr(toWrapped(context, thisObject));
+ RefPtr jsIPC = toWrapped(context, thisObject);
if (!jsIPC) {
*exception = createTypeError(context, "Wrong type"_s);
return JSValueMakeUndefined(context);
@@ -1196,7 +1196,7 @@
{
auto* globalObject = toJS(context);
JSC::JSLockHolder lock(globalObject->vm());
- auto jsIPC = makeRefPtr(toWrapped(context, thisObject));
+ RefPtr jsIPC = toWrapped(context, thisObject);
if (!jsIPC) {
*exception = createTypeError(context, "Wrong type"_s);
return JSValueMakeUndefined(context);
@@ -1281,7 +1281,7 @@
JSValueRef JSIPC::vmPageSize(JSContextRef context, JSObjectRef thisObject, JSStringRef, JSValueRef* exception)
{
- auto jsIPC = makeRefPtr(toWrapped(context, thisObject));
+ RefPtr jsIPC = toWrapped(context, thisObject);
if (!jsIPC) {
*exception = createTypeError(context, "Wrong type"_s);
return JSValueMakeUndefined(context);
Modified: trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDrawingArea.mm (282847 => 282848)
--- trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDrawingArea.mm 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDrawingArea.mm 2021-09-21 23:03:37 UTC (rev 282848)
@@ -288,7 +288,7 @@
if (m_webPage.firstFlushAfterCommit())
return;
- [CATransaction addCommitHandler:[retainedPage = makeRefPtr(&m_webPage)] {
+ [CATransaction addCommitHandler:[retainedPage = Ref { m_webPage }] {
if (Page* corePage = retainedPage->corePage()) {
if (Frame* coreFrame = retainedPage->mainFrame())
corePage->inspectorController().willComposite(*coreFrame);
@@ -295,7 +295,7 @@
}
} forPhase:kCATransactionPhasePreCommit];
- [CATransaction addCommitHandler:[retainedPage = makeRefPtr(&m_webPage)] {
+ [CATransaction addCommitHandler:[retainedPage = Ref { m_webPage }] {
if (Page* corePage = retainedPage->corePage()) {
if (Frame* coreFrame = retainedPage->mainFrame())
corePage->inspectorController().didComposite(*coreFrame);
Modified: trunk/Source/WebKit/WebProcess/WebPage/ViewGestureGeometryCollector.cpp (282847 => 282848)
--- trunk/Source/WebKit/WebProcess/WebPage/ViewGestureGeometryCollector.cpp 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/WebProcess/WebPage/ViewGestureGeometryCollector.cpp 2021-09-21 23:03:37 UTC (rev 282848)
@@ -150,7 +150,7 @@
if (m_cachedTextLegibilityScales)
return m_cachedTextLegibilityScales;
- auto document = makeRefPtr(m_webPage.mainFrame()->document());
+ RefPtr document = m_webPage.mainFrame()->document();
if (!document)
return std::nullopt;
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (282847 => 282848)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2021-09-21 23:03:37 UTC (rev 282848)
@@ -3758,7 +3758,7 @@
void WebPage::runJavaScriptInFrameInScriptWorld(RunJavaScriptParameters&& parameters, std::optional<WebCore::FrameIdentifier> frameID, const std::pair<ContentWorldIdentifier, String>& worldData, CompletionHandler<void(const IPC::DataReference&, const std::optional<WebCore::ExceptionDetails>&)>&& completionHandler)
{
WEBPAGE_RELEASE_LOG(Process, "runJavaScriptInFrameInScriptWorld: frameID=%" PRIu64, frameID.value_or(WebCore::FrameIdentifier { }).toUInt64());
- auto webFrame = makeRefPtr(frameID ? WebProcess::singleton().webFrame(*frameID) : &mainWebFrame());
+ RefPtr webFrame = frameID ? WebProcess::singleton().webFrame(*frameID) : &mainWebFrame();
if (auto* newWorld = m_userContentController->addContentWorld(worldData)) {
auto& coreWorld = newWorld->coreWorld();
@@ -3783,7 +3783,7 @@
break;
case ContentAsStringIncludesChildFrames::Yes:
StringBuilder builder;
- for (auto frame = makeRefPtr(m_mainFrame->coreFrame()); frame; frame = frame->tree().traverseNextRendered()) {
+ for (RefPtr frame = m_mainFrame->coreFrame(); frame; frame = frame->tree().traverseNextRendered()) {
if (auto webFrame = WebFrame::fromCoreFrame(*frame))
builder.append(builder.isEmpty() ? "" : "\n\n", webFrame->contentsAsString());
}
@@ -4070,8 +4070,8 @@
void WebPage::removeDataDetectedLinks(CompletionHandler<void(const DataDetectionResult&)>&& completionHandler)
{
- for (auto frame = makeRefPtr(&m_page->mainFrame()); frame; frame = frame->tree().traverseNext()) {
- auto document = makeRefPtr(frame->document());
+ for (RefPtr frame = &m_page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
+ RefPtr document = frame->document();
if (!document)
continue;
@@ -4089,8 +4089,8 @@
void WebPage::detectDataInAllFrames(OptionSet<WebCore::DataDetectorType> dataDetectorTypes, CompletionHandler<void(const DataDetectionResult&)>&& completionHandler)
{
DataDetectionResult mainFrameResult;
- for (auto frame = makeRefPtr(&m_page->mainFrame()); frame; frame = frame->tree().traverseNext()) {
- auto document = makeRefPtr(frame->document());
+ for (RefPtr frame = &m_page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
+ RefPtr document = frame->document();
if (!document)
continue;
auto results = retainPtr(DataDetection::detectContentInRange(makeRangeSelectingNodeContents(*document), dataDetectorTypes, m_dataDetectionContext.get()));
@@ -7297,7 +7297,7 @@
if (!m_page)
return;
- auto mainDocument = makeRefPtr(m_page->mainFrame().document());
+ RefPtr mainDocument = m_page->mainFrame().document();
if (!mainDocument)
return;
@@ -7327,7 +7327,7 @@
return;
}
- auto mainDocument = makeRefPtr(m_page->mainFrame().document());
+ RefPtr mainDocument = m_page->mainFrame().document();
if (!mainDocument) {
completionHandler(true, { });
return;
@@ -7470,7 +7470,7 @@
if (completion) {
RefPtr<Element> imageOverlayHost;
if (htmlElement->hasImageOverlay())
- imageOverlayHost = makeRefPtr(element);
+ imageOverlayHost = &element;
completion(WTFMove(imageOverlayHost));
}
return;
@@ -7517,7 +7517,7 @@
auto cachedImage = renderImage.cachedImage();
auto imageURL = cachedImage ? element.document().completeURL(cachedImage->url().string()) : URL { };
sendWithAsyncReply(Messages::WebPageProxy::RequestTextRecognition(WTFMove(imageURL), WTFMove(bitmapHandle)), [webPage = makeWeakPtr(*this), weakElement = makeWeakPtr(element)] (auto&& result) {
- auto protectedPage = makeRefPtr(webPage.get());
+ RefPtr protectedPage { webPage.get() };
if (!protectedPage)
return;
@@ -7531,7 +7531,7 @@
return true;
});
- auto protectedElement = makeRefPtr(weakElement.get());
+ RefPtr protectedElement { weakElement.get() };
if (!protectedElement)
return;
@@ -7545,7 +7545,7 @@
if (matchIndex == notFound)
return;
- auto imageOverlayHost = htmlElement.hasImageOverlay() ? makeRefPtr(htmlElement) : nullptr;
+ RefPtr imageOverlayHost = htmlElement.hasImageOverlay() ? &htmlElement : nullptr;
for (auto& completionHandler : protectedPage->m_elementsPendingTextRecognition[matchIndex].second)
completionHandler(imageOverlayHost.copyRef());
@@ -7568,7 +7568,7 @@
HitTestRequest::Type::AllowVisibleChildFrameContentOnly,
});
- auto nodeAtLocation = makeRefPtr(hitTestResult.innerNonSharedNode());
+ RefPtr nodeAtLocation = hitTestResult.innerNonSharedNode();
auto updateResult = ([&] {
if (!nodeAtLocation || nodeAtLocation->shadowHost() != elementToUpdate || !HTMLElement::isInsideImageOverlay(*nodeAtLocation))
return TextRecognitionUpdateResult::NoText;
@@ -7657,7 +7657,7 @@
RefPtr document = CheckedRef(m_page->focusController())->focusedOrMainFrame().document();
- auto frame = makeRefPtr(document->frame());
+ RefPtr frame = document->frame();
if (!frame)
return false;
@@ -7690,7 +7690,7 @@
{
m_appHighlightsVisible = appHighlightVisibility;
for (RefPtr<Frame> frame = m_mainFrame->coreFrame(); frame; frame = frame->tree().traverseNextRendered()) {
- if (auto document = makeRefPtr(frame->document()))
+ if (RefPtr document = frame->document())
document->appHighlightRegister().setHighlightVisibility(appHighlightVisibility);
}
}
Modified: trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (282847 => 282848)
--- trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2021-09-21 23:03:37 UTC (rev 282848)
@@ -343,7 +343,7 @@
postLayoutData.caretColor = CaretBase::computeCaretColor(editableRoot->renderer()->style(), editableRoot.get());
}
- if (auto editableRootOrFormControl = makeRefPtr(enclosingTextFormControl(selection.start()) ?: selection.rootEditableElement())) {
+ if (RefPtr editableRootOrFormControl = enclosingTextFormControl(selection.start()) ?: selection.rootEditableElement()) {
postLayoutData.selectionClipRect = rootViewInteractionBounds(*editableRootOrFormControl);
postLayoutData.editableRootIsTransparentOrFullyClipped = result.isContentEditable && isTransparentOrFullyClipped(*editableRootOrFormControl);
}
@@ -1345,7 +1345,7 @@
static bool insideImageOverlay(const VisiblePosition& position)
{
- auto container = makeRefPtr(position.deepEquivalent().containerNode());
+ RefPtr container = position.deepEquivalent().containerNode();
return container && HTMLElement::isInsideImageOverlay(*container);
}
@@ -1355,7 +1355,7 @@
VisiblePosition expandedEnd(makeContainerOffsetPosition(&range.endContainer(), range.endOffset()));
for (auto start = expandedStart; insideImageOverlay(start); start = start.previous()) {
- if (auto container = makeRefPtr(start.deepEquivalent().containerNode()); is<Text>(container)) {
+ if (RefPtr container = start.deepEquivalent().containerNode(); is<Text>(container)) {
expandedStart = firstPositionInNode(container.get()).downstream();
break;
}
@@ -1362,7 +1362,7 @@
}
for (auto end = expandedEnd; insideImageOverlay(end); end = end.next()) {
- if (auto container = makeRefPtr(end.deepEquivalent().containerNode()); is<Text>(container)) {
+ if (RefPtr container = end.deepEquivalent().containerNode(); is<Text>(container)) {
expandedEnd = lastPositionInNode(container.get()).upstream();
break;
}
@@ -1540,7 +1540,7 @@
HitTestRequest::Type::AllowVisibleChildFrameContentOnly,
});
- auto targetNode = makeRefPtr(hitTest.targetNode());
+ RefPtr targetNode = hitTest.targetNode();
if (targetNode && !HTMLElement::shouldExtendSelectionToTargetNode(*targetNode, existingSelection))
return std::nullopt;
@@ -1555,7 +1555,7 @@
if (baseIsStart) {
if (result <= selectionStart)
result = selectionStart.next();
- else if (auto containerNode = makeRefPtr(selectionStart.deepEquivalent().containerNode()); containerNode && targetNode && &containerNode->treeScope() != &targetNode->treeScope())
+ else if (RefPtr containerNode = selectionStart.deepEquivalent().containerNode(); containerNode && targetNode && &containerNode->treeScope() != &targetNode->treeScope())
result = VisibleSelection::adjustPositionForEnd(result.deepEquivalent(), containerNode.get());
range = makeSimpleRange(selectionStart, result);
@@ -1562,7 +1562,7 @@
} else {
if (selectionEnd <= result)
result = selectionEnd.previous();
- else if (auto containerNode = makeRefPtr(selectionEnd.deepEquivalent().containerNode()); containerNode && targetNode && &containerNode->treeScope() != &targetNode->treeScope())
+ else if (RefPtr containerNode = selectionEnd.deepEquivalent().containerNode(); containerNode && targetNode && &containerNode->treeScope() != &targetNode->treeScope())
result = VisibleSelection::adjustPositionForStart(result.deepEquivalent(), containerNode.get());
range = makeSimpleRange(result, selectionEnd);
@@ -1630,11 +1630,11 @@
IntRect WebPage::rootViewBounds(const Node& node)
{
- auto frame = makeRefPtr(node.document().frame());
+ RefPtr frame = node.document().frame();
if (!frame)
return { };
- auto view = makeRefPtr(frame->view());
+ RefPtr view = frame->view();
if (!view)
return { };
@@ -1647,11 +1647,11 @@
IntRect WebPage::absoluteInteractionBounds(const Node& node)
{
- auto frame = makeRefPtr(node.document().frame());
+ RefPtr frame = node.document().frame();
if (!frame)
return { };
- auto view = makeRefPtr(frame->view());
+ RefPtr view = frame->view();
if (!view)
return { };
@@ -1682,11 +1682,11 @@
IntRect WebPage::rootViewInteractionBounds(const Node& node)
{
- auto frame = makeRefPtr(node.document().frame());
+ RefPtr frame = node.document().frame();
if (!frame)
return { };
- auto view = makeRefPtr(frame->view());
+ RefPtr view = frame->view();
if (!view)
return { };
@@ -1894,7 +1894,7 @@
void WebPage::requestEvasionRectsAboveSelection(CompletionHandler<void(const Vector<FloatRect>&)>&& reply)
{
Ref frame = CheckedRef(m_page->focusController())->focusedOrMainFrame();
- auto frameView = makeRefPtr(frame->view());
+ RefPtr frameView = frame->view();
if (!frameView) {
reply({ });
return;
@@ -1973,7 +1973,7 @@
}
for (auto& node : hitTestedNodes) {
- auto frameView = makeRefPtr(node->document().view());
+ RefPtr frameView = node->document().view();
auto* renderer = node->renderer();
if (!renderer || !frameView)
continue;
@@ -2717,7 +2717,7 @@
static void dataDetectorImageOverlayPositionInformation(const HTMLElement& overlayHost, const InteractionInformationRequest& request, InteractionInformationAtPosition& info)
{
- auto frame = makeRefPtr(overlayHost.document().frame());
+ RefPtr frame = overlayHost.document().frame();
if (!frame)
return;
@@ -2891,7 +2891,7 @@
if (info.isSelectable && !hitNode->isTextNode())
info.isSelectable = !isAssistableElement(*downcast<Element>(hitNode)) && !rectIsTooBigForSelection(info.bounds, *result.innerNodeFrame());
}
- for (auto currentNode = makeRefPtr(hitNode); currentNode; currentNode = currentNode->parentOrShadowHostNode()) {
+ for (RefPtr currentNode = hitNode; currentNode; currentNode = currentNode->parentOrShadowHostNode()) {
auto* renderer = currentNode->renderer();
if (!renderer)
continue;
@@ -2957,11 +2957,11 @@
static void populateCaretContext(const HitTestResult& hitTestResult, const InteractionInformationRequest& request, InteractionInformationAtPosition& info)
{
- auto frame = makeRefPtr(hitTestResult.innerNodeFrame());
+ RefPtr frame = hitTestResult.innerNodeFrame();
if (!frame)
return;
- auto view = makeRefPtr(frame->view());
+ RefPtr view = frame->view();
if (!view)
return;
@@ -3054,7 +3054,7 @@
if (m_focusedElement)
focusedElementPositionInformation(*this, *m_focusedElement, request, info);
- auto hitTestNode = makeRefPtr(hitTestResult.innerNonSharedNode());
+ RefPtr hitTestNode = hitTestResult.innerNonSharedNode();
if (is<Element>(nodeRespondingToClickEvents)) {
auto& element = downcast<Element>(*nodeRespondingToClickEvents);
elementPositionInformation(*this, element, request, hitTestNode.get(), info);
@@ -3114,7 +3114,7 @@
if (is<RenderImage>(*element.renderer())) {
URL urlToCopy;
String titleToCopy;
- if (auto linkElement = makeRefPtr(containingLinkAnchorElement(element))) {
+ if (RefPtr linkElement = containingLinkAnchorElement(element)) {
if (auto url = "" !url.isEmpty() && !url.protocolIsJavaScript()) {
urlToCopy = url;
titleToCopy = linkElement->attributeWithoutSynchronization(HTMLNames::titleAttr);
@@ -3717,12 +3717,12 @@
if (m_viewportConfiguration.canIgnoreScalingConstraints())
return;
- auto mainFrame = makeRefPtr(m_mainFrame->coreFrame());
+ RefPtr mainFrame = m_mainFrame->coreFrame();
if (!mainFrame)
return;
- auto view = makeRefPtr(mainFrame->view());
- auto mainDocument = makeRefPtr(mainFrame->document());
+ RefPtr view = mainFrame->view();
+ RefPtr mainDocument = mainFrame->document();
if (!view || !mainDocument)
return;
@@ -4044,7 +4044,7 @@
viewportConfigurationChanged();
double minimumEffectiveDeviceWidthWhenIgnoringScalingConstraints = ([&] {
- auto document = makeRefPtr(frame.document());
+ RefPtr document = frame.document();
if (!document)
return 0;
@@ -4287,7 +4287,7 @@
void WebPage::updateSelectionWithDelta(int64_t locationDelta, int64_t lengthDelta, CompletionHandler<void()>&& completionHandler)
{
Ref frame = CheckedRef(m_page->focusController())->focusedOrMainFrame();
- auto root = makeRefPtr(frame->selection().rootEditableElementOrDocumentElement());
+ RefPtr root = frame->selection().rootEditableElementOrDocumentElement();
auto selectionRange = frame->selection().selection().toNormalizedRange();
if (!root || !selectionRange) {
completionHandler();
@@ -4369,7 +4369,7 @@
}
Ref frame = CheckedRef(m_page->focusController())->focusedOrMainFrame();
- makeRefPtr(frame->document())->updateLayoutIgnorePendingStylesheets();
+ RefPtr { frame->document() }->updateLayoutIgnorePendingStylesheets();
VisibleSelection selection = frame->selection().selection();
@@ -4635,11 +4635,11 @@
return true;
};
- auto startContainer = makeRefPtr(selection.start().containerNode());
+ RefPtr startContainer = selection.start().containerNode();
if (scheduleEditorStateUpdateForStartOrEndContainerNodeIfNeeded(startContainer.get()))
return;
- auto endContainer = makeRefPtr(selection.end().containerNode());
+ RefPtr endContainer = selection.end().containerNode();
if (startContainer != endContainer)
scheduleEditorStateUpdateForStartOrEndContainerNodeIfNeeded(endContainer.get());
}
Modified: trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (282847 => 282848)
--- trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2021-09-21 23:03:37 UTC (rev 282848)
@@ -413,7 +413,7 @@
if (m_webPage.firstFlushAfterCommit())
return;
- [CATransaction addCommitHandler:[retainedPage = makeRefPtr(&m_webPage)] {
+ [CATransaction addCommitHandler:[retainedPage = Ref { m_webPage }] {
if (Page* corePage = retainedPage->corePage()) {
if (Frame* coreFrame = retainedPage->mainFrame())
corePage->inspectorController().willComposite(*coreFrame);
@@ -420,7 +420,7 @@
}
} forPhase:kCATransactionPhasePreCommit];
- [CATransaction addCommitHandler:[retainedPage = makeRefPtr(&m_webPage)] {
+ [CATransaction addCommitHandler:[retainedPage = Ref { m_webPage }] {
if (Page* corePage = retainedPage->corePage()) {
if (Frame* coreFrame = retainedPage->mainFrame())
corePage->inspectorController().didComposite(*coreFrame);
Modified: trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm (282847 => 282848)
--- trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm 2021-09-21 23:03:37 UTC (rev 282848)
@@ -891,7 +891,7 @@
};
URL absoluteLinkURL = hitTestResult.absoluteLinkURL();
- if (auto urlElement = makeRefPtr(hitTestResult.URLElement()); !absoluteLinkURL.isEmpty() && urlElement) {
+ if (auto urlElement = RefPtr { hitTestResult.URLElement() }; !absoluteLinkURL.isEmpty() && urlElement) {
auto elementRange = makeRangeSelectingNodeContents(*urlElement);
immediateActionResult.linkTextIndicator = TextIndicator::createWithRange(elementRange, indicatorOptions(elementRange), TextIndicatorPresentationTransition::FadeIn);
}
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (282847 => 282848)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2021-09-21 23:03:37 UTC (rev 282848)
@@ -1,3 +1,22 @@
+2021-09-21 Chris Dumez <[email protected]>
+
+ Drop makeRefPtr() and use RefPtr { } directly instead
+ https://bugs.webkit.org/show_bug.cgi?id=230564
+
+ Reviewed by Alex Christensen.
+
+ * DOM/DOM.mm:
+ (-[DOMRange renderedImageForcingBlackText:renderedImageForcingBlackText:]):
+ * WebCoreSupport/WebContextMenuClient.mm:
+ (WebContextMenuClient::imageForCurrentSharingServicePickerItem):
+ * WebCoreSupport/WebDragClient.mm:
+ (WebDragClient::declareAndWriteDragImage):
+ * WebView/WebHTMLRepresentation.mm:
+ (-[WebHTMLRepresentation elementWithName:inForm:]):
+ (-[WebHTMLRepresentation controlsInForm:]):
+ * WebView/WebView.mm:
+ (-[WebView updateTextTouchBar]):
+
2021-09-21 David Kilzer <[email protected]>
Rename {checked,dynamic}_ns_cast<> to {checked,dynamic}_objc_cast<>
Modified: trunk/Source/WebKitLegacy/mac/DOM/DOM.mm (282847 => 282848)
--- trunk/Source/WebKitLegacy/mac/DOM/DOM.mm 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKitLegacy/mac/DOM/DOM.mm 2021-09-21 23:03:37 UTC (rev 282848)
@@ -584,7 +584,7 @@
#endif
{
auto range = makeSimpleRange(*core(self));
- auto frame = makeRefPtr(range.start.document().frame());
+ RefPtr frame = range.start.document().frame();
if (!frame)
return nil;
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebContextMenuClient.mm (282847 => 282848)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebContextMenuClient.mm 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebContextMenuClient.mm 2021-09-21 23:03:37 UTC (rev 282848)
@@ -198,11 +198,11 @@
if (!page)
return nil;
- auto node = makeRefPtr(page->contextMenuController().context().hitTestResult().innerNode());
+ RefPtr node = page->contextMenuController().context().hitTestResult().innerNode();
if (!node)
return nil;
- auto frameView = makeRefPtr(node->document().view());
+ RefPtr frameView = node->document().view();
if (!frameView) {
// This method shouldn't be called in cases where the controlled node isn't in a rendered view.
ASSERT_NOT_REACHED();
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebDragClient.mm (282847 => 282848)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebDragClient.mm 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebDragClient.mm 2021-09-21 23:03:37 UTC (rev 282848)
@@ -271,7 +271,7 @@
void WebDragClient::declareAndWriteDragImage(const String& pasteboardName, Element& element, const URL& url, const String& label, Frame*)
{
- if (auto frame = makeRefPtr(element.document().frame()))
+ if (RefPtr frame = element.document().frame())
frame->editor().writeImageToPasteboard(*Pasteboard::createForDragAndDrop(PagePasteboardContext::create(frame->pageID())), element, url, label);
}
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebHTMLRepresentation.mm (282847 => 282848)
--- trunk/Source/WebKitLegacy/mac/WebView/WebHTMLRepresentation.mm 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebHTMLRepresentation.mm 2021-09-21 23:03:37 UTC (rev 282848)
@@ -290,8 +290,8 @@
ScriptDisallowedScope::InMainThread scriptDisallowedScope;
AtomString targetName = name;
for (auto& weakElement : formElement->unsafeAssociatedElements()) {
- auto element = makeRefPtr(weakElement.get());
- if (element->asFormAssociatedElement()->name() == targetName)
+ RefPtr element { weakElement.get() };
+ if (element && element->asFormAssociatedElement()->name() == targetName)
return kit(element.get());
}
return nil;
@@ -337,8 +337,8 @@
ScriptDisallowedScope::InMainThread scriptDisallowedScope;
auto result = createNSArray(formElement->unsafeAssociatedElements(), [] (auto& weakElement) -> DOMElement * {
- auto coreElement = makeRefPtr(weakElement.get());
- if (!coreElement->asFormAssociatedElement()->isEnumeratable()) // Skip option elements, other duds
+ RefPtr coreElement { weakElement.get() };
+ if (!coreElement || !coreElement->asFormAssociatedElement()->isEnumeratable()) // Skip option elements, other duds
return nil;
return kit(coreElement.get());
});
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.mm (282847 => 282848)
--- trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2021-09-21 23:03:37 UTC (rev 282848)
@@ -9510,7 +9510,7 @@
[_private->_textTouchBarItemController setCurrentTextAlignment:nsTextAlignmentFromRenderStyle(style)];
- auto enclosingListElement = makeRefPtr(enclosingList(selection.start().deprecatedNode()));
+ RefPtr enclosingListElement = enclosingList(selection.start().deprecatedNode());
if (enclosingListElement) {
if (is<HTMLUListElement>(*enclosingListElement))
[[_private->_textTouchBarItemController webTextListTouchBarViewController] setCurrentListType:WebListType::Unordered];
Modified: trunk/Tools/ChangeLog (282847 => 282848)
--- trunk/Tools/ChangeLog 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Tools/ChangeLog 2021-09-21 23:03:37 UTC (rev 282848)
@@ -1,3 +1,13 @@
+2021-09-21 Chris Dumez <[email protected]>
+
+ Drop makeRefPtr() and use RefPtr { } directly instead
+ https://bugs.webkit.org/show_bug.cgi?id=230564
+
+ Reviewed by Alex Christensen.
+
+ * TestWebKitAPI/Tests/WTF/RunLoop.cpp:
+ (TestWebKitAPI::TEST):
+
2021-09-21 David Kilzer <[email protected]>
Rename {checked,dynamic}_ns_cast<> to {checked,dynamic}_objc_cast<>
Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/RunLoop.cpp (282847 => 282848)
--- trunk/Tools/TestWebKitAPI/Tests/WTF/RunLoop.cpp 2021-09-21 23:02:16 UTC (rev 282847)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/RunLoop.cpp 2021-09-21 23:03:37 UTC (rev 282848)
@@ -220,7 +220,7 @@
RefPtr<RunLoop> runLoop;
Thread::create("RunLoopThreadTerminationSelfReferenceCleanup", [&] {
- runLoop = makeRefPtr(RunLoop::current());
+ runLoop = &RunLoop::current();
// This stores a RunLoop reference in the dispatch queue that will not be released
// via the usual dispatch, but should still be released upon thread termination.
