Address remaining safer CPP warnings in WebKit/WebProcess/InjectedBundle

cdumez · cdumez · commit 7d39c09c5961 · 2025-11-04T03:23:59.000-08:00
https://bugs.webkit.org/show_bug.cgi?id=301909 Reviewed by Anne van Kesteren. * Source/WebCore/dom/Document.cpp: (WebCore::Document::protectedBodyOrFrameset const): * Source/WebCore/dom/Document.h: * Source/WebCore/dom/Range.h: * Source/WebKit/SaferCPPExpectations/UncheckedCallArgsCheckerExpectations: * Source/WebKit/SaferCPPExpectations/UncountedCallArgsCheckerExpectations: * Source/WebKit/SaferCPPExpectations/UnretainedCallArgsCheckerExpectations: * Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp: (WKBundlePostSynchronousMessage): (WKBundleCreateWKDataFromUInt8Array): * Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleDOMWindowExtension.cpp: (WKBundleDOMWindowExtensionCreate): * Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp: (WKBundleFrameCopyChildFrames): (WKBundleFrameGetPage): (WKBundleFrameCreateHitTestResult): * Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp: (WKBundleHitTestResultCopyNodeHandle): (WKBundleHitTestResultCopyURLElementHandle): * Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp: (WKBundleNodeHandleCreate): (WKBundleNodeHandleCopyDocument): (WKBundleNodeHandleCopySnapshotWithOptions): (WKBundleNodeHandleCopyDocumentFrame): (WKBundleNodeHandleCopyHTMLIFrameElementContentFrame): (WKBundleNodeHandleCopyOwningDocumentFrame): * Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp: (WKBundleFrameCreateFrameHandle): (WKBundlePageCopyContextMenuItems): (WKBundlePageCopyContextMenuAtPointInWindow): (WKBundlePageCreateSnapshotWithOptions): (WKBundlePageCreateSnapshotInViewCoordinates): (WKBundlePageCreateSnapshotInDocumentCoordinates): (WKBundlePageCreateScaledSnapshotInDocumentCoordinates): (WKBundlePageCopyTrackedRepaintRects): (WKBundlePagePostSynchronousMessageForTesting): (WKBundlePageCreateCaptionUserPreferencesTestingModeToken): (WKBundlePageCopyFrameTextForTesting): * Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp: (WKBundlePageOverlayCreate): * Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.cpp: (WKBundleRangeHandleCreate): (WKBundleRangeHandleCopySnapshotWithOptions): (WKBundleRangeHandleCopyDocumentFrame): * Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp: (WKBundleScriptWorldCreateWorld): * Source/WebKit/WebProcess/InjectedBundle/API/c/mac/WKBundleMac.mm: (WKBundleGetParameters): * Source/WebKit/WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm: (WKBundlePageBannerCreateBannerWithCALayer): (WKBundlePageBannerGetLayer): * Source/WebKit/WebProcess/InjectedBundle/API/mac/WKDOMDocument.mm: (-[WKDOMDocument body]): * Source/WebKit/WebProcess/InjectedBundle/API/mac/WKDOMInternals.h: * Source/WebKit/WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm: (WebKit::WKDOMNodeClassSingleton): (WebKit::createWrapper): (WebKit::toProtectedWebCoreNode): (WebKit::toProtectedWebCoreDocument): (WebKit::toWebCoreRange): (WebKit::toProtectedWebCoreRange): (WebKit::WKDOMNodeClass): Deleted. * Source/WebKit/WebProcess/InjectedBundle/API/mac/WKDOMNode.mm: (-[WKDOMNode insertNode:before:]): (-[WKDOMNode appendChild:]): (-[WKDOMNode removeChild:]): (-[WKDOMNode document]): (-[WKDOMNode parentNode]): (-[WKDOMNode firstChild]): (-[WKDOMNode lastChild]): (-[WKDOMNode previousSibling]): (-[WKDOMNode nextSibling]): (-[WKDOMNode textRects]): (-[WKDOMNode _copyBundleNodeHandleRef]): * Source/WebKit/WebProcess/InjectedBundle/API/mac/WKDOMRange.mm: (-[WKDOMRange initWithDocument:]): (-[WKDOMRange selectNode:]): (-[WKDOMRange selectNodeContents:]): (-[WKDOMRange startContainer]): (-[WKDOMRange endContainer]): (-[WKDOMRange text]): (-[WKDOMRange textRects]): (-[WKDOMRange _copyBundleRangeHandleRef]): * Source/WebKit/WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.mm: (-[WKDOMTextIterator initWithRange:]): * Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm: (protectedBundle): (-[WKWebProcessPlugInController dealloc]): (didCreatePage): (willDestroyPage): (-[WKWebProcessPlugInController _setPrincipalClassInstance:]): (-[WKWebProcessPlugInController parameters]): (-[WKWebProcessPlugInController extendClassesForParameterCoder:]): (-[WKWebProcessPlugInController _bundleRef]): * Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm: (protectedPage): (didStartProvisionalLoadForFrame): (didReceiveServerRedirectForProvisionalLoadForFrame): (didFinishLoadForFrame): (didClearWindowObjectForFrame): (globalObjectIsAvailableForFrame): (serviceWorkerGlobalObjectIsAvailableForFrame): (willInjectUserScriptForFrame): (didRemoveFrameFromHierarchy): (didCommitLoadForFrame): (didFinishDocumentLoadForFrame): (didFailProvisionalLoadWithErrorForFrame): (didFailLoadWithErrorForFrame): (didSameDocumentNavigationForFrame): (didLayoutForFrame): (didFirstVisuallyNonEmptyLayoutForFrame): (didHandleOnloadEventsForFrame): (willSendRequestForFrame): (didInitiateLoadForResource): (didReceiveResponseForResource): (didFinishLoadForResource): (didFailLoadForResource): (-[WKWebProcessPlugInBrowserContextController setLoadDelegate:]): (-[WKWebProcessPlugInBrowserContextController dealloc]): (-[WKWebProcessPlugInBrowserContextController mainFrameDocument]): (-[WKWebProcessPlugInBrowserContextController selectedRange]): (-[WKWebProcessPlugInBrowserContextController _bundlePageRef]): (-[WKWebProcessPlugInBrowserContextController _setFormDelegate:]): (-[WKWebProcessPlugInBrowserContextController _setEditingDelegate:]): (-[WKWebProcessPlugInBrowserContextController _usesNonPersistentWebsiteDataStore]): Canonical link: https://commits.webkit.org/302531@main
diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
@@ -4194,6 +4194,11 @@ HTMLElement* Document::bodyOrFrameset() const
     return nullptr;
 }
 
+RefPtr<HTMLElement> Document::protectedBodyOrFrameset() const
+{
+    return bodyOrFrameset();
+}
+
 ExceptionOr<void> Document::setBodyOrFrameset(RefPtr<HTMLElement>&& newBody)
 {
     if (!is<HTMLBodyElement>(newBody) && !is<HTMLFrameSetElement>(newBody))
diff --git a/Source/WebCore/dom/Document.h b/Source/WebCore/dom/Document.h
@@ -1241,6 +1241,7 @@ class Document
     // This is the "body element" as defined by HTML5, the first body or frameset child of the
     // document element. See https://html.spec.whatwg.org/multipage/dom.html#the-body-element-2.
     WEBCORE_EXPORT HTMLElement* bodyOrFrameset() const;
+    WEBCORE_EXPORT RefPtr<HTMLElement> protectedBodyOrFrameset() const;
     WEBCORE_EXPORT ExceptionOr<void> setBodyOrFrameset(RefPtr<HTMLElement>&&);
 
     Location* location() const;
diff --git a/Source/WebCore/dom/Range.h b/Source/WebCore/dom/Range.h
@@ -49,10 +49,10 @@ class Range final : public AbstractRange, public CanMakeSingleThreadWeakPtr<Rang
     WEBCORE_EXPORT ~Range();
 
     Node& startContainer() const final { return m_start.container(); }
-    Ref<Node> protectedStartContainer() const;
+    WEBCORE_EXPORT Ref<Node> protectedStartContainer() const;
     unsigned startOffset() const final { return m_start.offset(); }
     Node& endContainer() const final { return m_end.container(); }
-    Ref<Node> protectedEndContainer() const;
+    WEBCORE_EXPORT Ref<Node> protectedEndContainer() const;
     unsigned endOffset() const final { return m_end.offset(); }
     bool collapsed() const final { return m_start == m_end; }
     WEBCORE_EXPORT Node* commonAncestorContainer() const;
diff --git a/Source/WebKit/SaferCPPExpectations/UncheckedCallArgsCheckerExpectations b/Source/WebKit/SaferCPPExpectations/UncheckedCallArgsCheckerExpectations
@@ -14,10 +14,6 @@ Platform/IPC/ArgumentCoders.h
 [ iOS ] UIProcess/ios/WKContentViewInteraction.mm
 [ iOS ] UIProcess/ios/WebPageProxyIOS.mm
 [ iOS ] UIProcess/ios/fullscreen/WKFullScreenViewController.mm
-WebProcess/InjectedBundle/API/mac/WKDOMDocument.mm
-WebProcess/InjectedBundle/API/mac/WKDOMNode.mm
-WebProcess/InjectedBundle/API/mac/WKDOMRange.mm
-WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm
 [ iOS ] WebProcess/Plugins/PDF/UnifiedPDF/UnifiedPDFPlugin.mm
 [ iOS ] WebProcess/WebPage/WebFoundTextRangeController.cpp
 [ iOS ] WebProcess/WebPage/ios/FindControllerIOS.mm
diff --git a/Source/WebKit/SaferCPPExpectations/UncountedCallArgsCheckerExpectations b/Source/WebKit/SaferCPPExpectations/UncountedCallArgsCheckerExpectations
@@ -48,15 +48,6 @@ Platform/IPC/ArgumentCoders.h
 [ iOS ] UIProcess/ios/fullscreen/WKFullScreenViewController.mm
 [ iOS ] UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm
 [ iOS ] WebProcess/GPU/media/ios/RemoteMediaSessionHelper.cpp
-WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp
-WebProcess/InjectedBundle/API/c/mac/WKBundleMac.mm
-[ Mac ] WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm
-WebProcess/InjectedBundle/API/mac/WKDOMDocument.mm
-WebProcess/InjectedBundle/API/mac/WKDOMNode.mm
-WebProcess/InjectedBundle/API/mac/WKDOMRange.mm
-WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.mm
-WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm
-WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm
 [ iOS ] WebProcess/Network/NetworkProcessConnection.cpp
 [ iOS ] WebProcess/Plugins/PDF/UnifiedPDF/UnifiedPDFPlugin.mm
 [ iOS ] WebProcess/WebCoreSupport/WebChromeClientCocoa.mm
diff --git a/Source/WebKit/SaferCPPExpectations/UnretainedCallArgsCheckerExpectations b/Source/WebKit/SaferCPPExpectations/UnretainedCallArgsCheckerExpectations
@@ -64,9 +64,6 @@
 [ iOS ] UIProcess/ios/forms/WKFormSelectPopover.mm
 [ iOS ] UIProcess/ios/fullscreen/WKFullScreenViewController.mm
 [ iOS ] UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm
-WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm
-WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm
-WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm
 WebProcess/Plugins/PDF/PDFIncrementalLoader.mm
 WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm
 WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm
diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundle.cpp
@@ -73,7 +73,7 @@ void WKBundlePostSynchronousMessage(WKBundleRef bundleRef, WKStringRef messageNa
     RefPtr<API::Object> returnData;
     WebKit::toProtectedImpl(bundleRef)->postSynchronousMessage(WebKit::toWTFString(messageNameRef), WebKit::toProtectedImpl(messageBodyRef).get(), returnData);
     if (returnRetainedDataRef)
-        SUPPRESS_UNCOUNTED_ARG *returnRetainedDataRef = WebKit::toAPI(returnData.leakRef());
+        *returnRetainedDataRef = WebKit::toAPILeakingRef(WTFMove(returnData));
 }
 
 void WKBundleGarbageCollectJavaScriptObjects(WKBundleRef bundleRef)
@@ -153,7 +153,7 @@ void WKBundleReleaseMemory(WKBundleRef)
 
 WKDataRef WKBundleCreateWKDataFromUInt8Array(WKBundleRef bundle, JSContextRef context, JSValueRef data)
 {
-    SUPPRESS_UNCOUNTED_ARG return WebKit::toAPI(&WebKit::toProtectedImpl(bundle)->createWebDataFromUint8Array(context, data).leakRef());
+    return WebKit::toAPILeakingRef(WebKit::toProtectedImpl(bundle)->createWebDataFromUint8Array(context, data));
 }
 
 int WKBundleNumberOfPages(WKBundleRef bundleRef, WKBundleFrameRef frameRef, double pageWidthInPixels, double pageHeightInPixels)
diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleDOMWindowExtension.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleDOMWindowExtension.cpp
@@ -40,7 +40,7 @@ WKTypeID WKBundleDOMWindowExtensionGetTypeID()
 WKBundleDOMWindowExtensionRef WKBundleDOMWindowExtensionCreate(WKBundleFrameRef frame, WKBundleScriptWorldRef world)
 {
     RefPtr<WebKit::InjectedBundleDOMWindowExtension> extension = WebKit::InjectedBundleDOMWindowExtension::create(WebKit::toProtectedImpl(frame).get(), WebKit::toProtectedImpl(world).get());
-    SUPPRESS_UNCOUNTED_ARG return toAPI(extension.leakRef());
+    return toAPILeakingRef(WTFMove(extension));
 }
 
 WKBundleFrameRef WKBundleDOMWindowExtensionGetFrame(WKBundleDOMWindowExtensionRef extension)
diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp
@@ -95,7 +95,7 @@ WKFrameLoadState WKBundleFrameGetFrameLoadState(WKBundleFrameRef frameRef)
 
 WKArrayRef WKBundleFrameCopyChildFrames(WKBundleFrameRef frameRef)
 {
-    SUPPRESS_UNCOUNTED_ARG return WebKit::toAPI(&WebKit::toImpl(frameRef)->childFrames().leakRef());
+    return WebKit::toAPILeakingRef(WebKit::toProtectedImpl(frameRef)->childFrames());
 }
 
 JSGlobalContextRef WKBundleFrameGetJavaScriptContext(WKBundleFrameRef frameRef)
@@ -140,7 +140,7 @@ unsigned WKBundleFrameGetPendingUnloadCount(WKBundleFrameRef frameRef)
 
 WKBundlePageRef WKBundleFrameGetPage(WKBundleFrameRef frameRef)
 {
-    return toAPI(WebKit::toProtectedImpl(frameRef)->page());
+    return toAPI(WebKit::toProtectedImpl(frameRef)->protectedPage().get());
 }
 
 void WKBundleFrameStopLoading(WKBundleFrameRef frameRef)
@@ -270,7 +270,7 @@ bool WKBundleFrameCallShouldCloseOnWebView(WKBundleFrameRef frameRef)
 WKBundleHitTestResultRef WKBundleFrameCreateHitTestResult(WKBundleFrameRef frameRef, WKPoint point)
 {
     ASSERT(frameRef);
-    return WebKit::toAPI(WebKit::toProtectedImpl(frameRef)->hitTest(WebKit::toIntPoint(point)).leakRef());
+    return WebKit::toAPILeakingRef(WebKit::toProtectedImpl(frameRef)->hitTest(WebKit::toIntPoint(point)));
 }
 
 WKSecurityOriginRef WKBundleFrameCopySecurityOrigin(WKBundleFrameRef frameRef)
diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp
@@ -42,13 +42,13 @@ WKTypeID WKBundleHitTestResultGetTypeID()
 WKBundleNodeHandleRef WKBundleHitTestResultCopyNodeHandle(WKBundleHitTestResultRef hitTestResultRef)
 {
     RefPtr<WebKit::InjectedBundleNodeHandle> nodeHandle = WebKit::toProtectedImpl(hitTestResultRef)->nodeHandle();
-    SUPPRESS_UNCOUNTED_ARG return toAPI(nodeHandle.leakRef());
+    return toAPILeakingRef(WTFMove(nodeHandle));
 }
 
 WKBundleNodeHandleRef WKBundleHitTestResultCopyURLElementHandle(WKBundleHitTestResultRef hitTestResultRef)
 {
     RefPtr<WebKit::InjectedBundleNodeHandle> urlElementNodeHandle = WebKit::toProtectedImpl(hitTestResultRef)->urlElementHandle();
-    SUPPRESS_UNCOUNTED_ARG return toAPI(urlElementNodeHandle.leakRef());
+    return toAPILeakingRef(WTFMove(urlElementNodeHandle));
 }
 
 WKBundleFrameRef WKBundleHitTestResultGetFrame(WKBundleHitTestResultRef)
diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp
@@ -82,13 +82,13 @@ WKTypeID WKBundleNodeHandleGetTypeID()
 WKBundleNodeHandleRef WKBundleNodeHandleCreate(JSContextRef contextRef, JSObjectRef objectRef)
 {
     RefPtr<WebKit::InjectedBundleNodeHandle> nodeHandle = WebKit::InjectedBundleNodeHandle::getOrCreate(contextRef, objectRef);
-    SUPPRESS_UNCOUNTED_ARG return toAPI(nodeHandle.leakRef());
+    return toAPILeakingRef(WTFMove(nodeHandle));
 }
 
 WKBundleNodeHandleRef WKBundleNodeHandleCopyDocument(WKBundleNodeHandleRef nodeHandleRef)
 {
     RefPtr<WebKit::InjectedBundleNodeHandle> nodeHandle = WebKit::toProtectedImpl(nodeHandleRef)->document();
-    SUPPRESS_UNCOUNTED_ARG return toAPI(nodeHandle.leakRef());
+    return toAPILeakingRef(WTFMove(nodeHandle));
 }
 
 WKRect WKBundleNodeHandleGetRenderRect(WKBundleNodeHandleRef nodeHandleRef, bool* isReplaced)
@@ -100,7 +100,7 @@ WKRect WKBundleNodeHandleGetRenderRect(WKBundleNodeHandleRef nodeHandleRef, bool
 WKImageRef WKBundleNodeHandleCopySnapshotWithOptions(WKBundleNodeHandleRef nodeHandleRef, WKSnapshotOptions options)
 {
     RefPtr<WebKit::WebImage> image = WebKit::toProtectedImpl(nodeHandleRef)->renderedImage(WebKit::toSnapshotOptions(options), options & kWKSnapshotOptionsExcludeOverflow);
-    SUPPRESS_UNCOUNTED_ARG return toAPI(image.leakRef());
+    return toAPILeakingRef(WTFMove(image));
 }
 
 WKBundleRangeHandleRef WKBundleNodeHandleCopyVisibleRange(WKBundleNodeHandleRef)
@@ -202,7 +202,7 @@ WKBundleNodeHandleRef WKBundleNodeHandleCopyHTMLTableCellElementCellAbove(WKBund
 WKBundleFrameRef WKBundleNodeHandleCopyDocumentFrame(WKBundleNodeHandleRef documentHandleRef)
 {
     RefPtr<WebKit::WebFrame> frame = WebKit::toProtectedImpl(documentHandleRef)->documentFrame();
-    SUPPRESS_UNCOUNTED_ARG return toAPI(frame.leakRef());
+    return toAPILeakingRef(WTFMove(frame));
 }
 
 WKBundleFrameRef WKBundleNodeHandleCopyHTMLFrameElementContentFrame(WKBundleNodeHandleRef htmlFrameElementHandleRef)
@@ -214,7 +214,7 @@ WKBundleFrameRef WKBundleNodeHandleCopyHTMLFrameElementContentFrame(WKBundleNode
 WKBundleFrameRef WKBundleNodeHandleCopyHTMLIFrameElementContentFrame(WKBundleNodeHandleRef htmlIFrameElementHandleRef)
 {
     RefPtr<WebKit::WebFrame> frame = WebKit::toProtectedImpl(htmlIFrameElementHandleRef)->htmlIFrameElementContentFrame();
-    SUPPRESS_UNCOUNTED_ARG return toAPI(frame.leakRef());
+    return toAPILeakingRef(WTFMove(frame));
 }
 
 bool WKBundleNodeHandleGetHTMLInputElementAutofilled(WKBundleNodeHandleRef htmlInputElementHandleRef)
@@ -236,6 +236,6 @@ void WKBundleNodeHandleSetHTMLInputElementAutoFillButtonEnabled(WKBundleNodeHand
 WKBundleFrameRef WKBundleNodeHandleCopyOwningDocumentFrame(WKBundleNodeHandleRef documentHandleRef)
 {
     if (RefPtr document = WebKit::toProtectedImpl(documentHandleRef)->document())
-        SUPPRESS_UNCOUNTED_ARG return toAPI(document->documentFrame().leakRef());
+        return toAPILeakingRef(document->documentFrame());
     return nullptr;
 }
diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
@@ -129,7 +129,7 @@ WKBundleFrameRef WKBundlePageGetMainFrame(WKBundlePageRef pageRef)
 
 WKFrameHandleRef WKBundleFrameCreateFrameHandle(WKBundleFrameRef bundleFrameRef)
 {
-    SUPPRESS_UNCOUNTED_ARG return WebKit::toAPI(&API::FrameHandle::create(WebKit::toImpl(bundleFrameRef)->frameID()).leakRef());
+    return WebKit::toAPILeakingRef(API::FrameHandle::create(WebKit::toImpl(bundleFrameRef)->frameID()));
 }
 
 void WKBundlePageClickMenuItem(WKBundlePageRef pageRef, WKContextMenuItemRef item)
@@ -156,8 +156,7 @@ WKArrayRef WKBundlePageCopyContextMenuItems(WKBundlePageRef pageRef)
 {
 #if ENABLE(CONTEXT_MENUS)
     Ref contextMenu = WebKit::toProtectedImpl(pageRef)->contextMenu();
-
-    SUPPRESS_UNCOUNTED_ARG return WebKit::toAPI(&contextMenuItems(contextMenu.get()).leakRef());
+    return WebKit::toAPILeakingRef(contextMenuItems(contextMenu.get()));
 #else
     UNUSED_PARAM(pageRef);
     return nullptr;
@@ -175,7 +174,7 @@ WKArrayRef WKBundlePageCopyContextMenuAtPointInWindow(WKBundlePageRef pageRef, W
     if (!contextMenu)
         return nullptr;
 
-    SUPPRESS_UNCOUNTED_ARG return WebKit::toAPI(&contextMenuItems(*contextMenu).leakRef());
+    return WebKit::toAPILeakingRef(contextMenuItems(*contextMenu));
 #else
     UNUSED_PARAM(pageRef);
     UNUSED_PARAM(point);
@@ -408,27 +407,27 @@ void WKBundlePageReplaceStringMatches(WKBundlePageRef pageRef, WKArrayRef matchI
 WKImageRef WKBundlePageCreateSnapshotWithOptions(WKBundlePageRef pageRef, WKRect rect, WKSnapshotOptions options)
 {
     RefPtr<WebKit::WebImage> webImage = WebKit::toProtectedImpl(pageRef)->scaledSnapshotWithOptions(WebKit::toIntRect(rect), 1, WebKit::toSnapshotOptions(options));
-    SUPPRESS_UNCOUNTED_ARG return toAPI(webImage.leakRef());
+    return toAPILeakingRef(WTFMove(webImage));
 }
 
 WKImageRef WKBundlePageCreateSnapshotInViewCoordinates(WKBundlePageRef pageRef, WKRect rect, WKImageOptions options)
 {
     auto snapshotOptions = WebKit::snapshotOptionsFromImageOptions(options);
     snapshotOptions.add(WebKit::SnapshotOption::InViewCoordinates);
     RefPtr<WebKit::WebImage> webImage = WebKit::toProtectedImpl(pageRef)->scaledSnapshotWithOptions(WebKit::toIntRect(rect), 1, snapshotOptions);
-    SUPPRESS_UNCOUNTED_ARG return toAPI(webImage.leakRef());
+    return toAPILeakingRef(WTFMove(webImage));
 }
 
 WKImageRef WKBundlePageCreateSnapshotInDocumentCoordinates(WKBundlePageRef pageRef, WKRect rect, WKImageOptions options)
 {
     RefPtr<WebKit::WebImage> webImage = WebKit::toProtectedImpl(pageRef)->scaledSnapshotWithOptions(WebKit::toIntRect(rect), 1, WebKit::snapshotOptionsFromImageOptions(options));
-    SUPPRESS_UNCOUNTED_ARG return toAPI(webImage.leakRef());
+    return toAPILeakingRef(WTFMove(webImage));
 }
 
 WKImageRef WKBundlePageCreateScaledSnapshotInDocumentCoordinates(WKBundlePageRef pageRef, WKRect rect, double scaleFactor, WKImageOptions options)
 {
     RefPtr<WebKit::WebImage> webImage = WebKit::toProtectedImpl(pageRef)->scaledSnapshotWithOptions(WebKit::toIntRect(rect), scaleFactor, WebKit::snapshotOptionsFromImageOptions(options));
-    SUPPRESS_UNCOUNTED_ARG return toAPI(webImage.leakRef());
+    return toAPILeakingRef(WTFMove(webImage));
 }
 
 double WKBundlePageGetBackingScaleFactor(WKBundlePageRef pageRef)
@@ -489,7 +488,7 @@ bool WKBundlePageIsTrackingRepaints(WKBundlePageRef pageRef)
 
 WKArrayRef WKBundlePageCopyTrackedRepaintRects(WKBundlePageRef pageRef)
 {
-    SUPPRESS_UNCOUNTED_ARG return WebKit::toAPI(&WebKit::toProtectedImpl(pageRef)->trackedRepaintRects().leakRef());
+    return WebKit::toAPILeakingRef(WebKit::toProtectedImpl(pageRef)->trackedRepaintRects());
 }
 
 void WKBundlePageSetComposition(WKBundlePageRef pageRef, WKStringRef text, int from, int length, bool suppressUnderline, WKArrayRef highlightData, WKArrayRef annotationData)
@@ -675,7 +674,7 @@ void WKBundlePagePostSynchronousMessageForTesting(WKBundlePageRef pageRef, WKStr
     RefPtr<API::Object> returnData;
     WebKit::toProtectedImpl(pageRef)->postSynchronousMessageForTesting(WebKit::toWTFString(messageNameRef), WebKit::toProtectedImpl(messageBodyRef).get(), returnData);
     if (returnRetainedDataRef)
-        SUPPRESS_UNCOUNTED_ARG *returnRetainedDataRef = WebKit::toAPI(returnData.leakRef());
+        *returnRetainedDataRef = WebKit::toAPILeakingRef(WTFMove(returnData));
 }
 
 bool WKBundlePageIsSuspended(WKBundlePageRef pageRef)
@@ -725,7 +724,7 @@ WKCaptionUserPreferencesTestingModeTokenRef WKBundlePageCreateCaptionUserPrefere
 {
 #if ENABLE(VIDEO)
     Ref captionPreferences = WebKit::toProtectedImpl(page)->protectedCorePage()->checkedGroup()->ensureCaptionPreferences();
-    SUPPRESS_UNCOUNTED_ARG return WebKit::toAPI(&API::CaptionUserPreferencesTestingModeToken::create(captionPreferences.get()).leakRef());
+    return WebKit::toAPILeakingRef(API::CaptionUserPreferencesTestingModeToken::create(captionPreferences.get()));
 #else
     UNUSED_PARAM(page);
     return { };
@@ -744,5 +743,5 @@ void WKBundlePageSetSkipDecidePolicyForResponseIfPossible(WKBundlePageRef page,
 
 WKStringRef WKBundlePageCopyFrameTextForTesting(WKBundlePageRef page, bool includeSubframes)
 {
-    SUPPRESS_UNCOUNTED_ARG return WebKit::toAPI(&API::String::create(WebKit::toProtectedImpl(page)->frameTextForTestingIncludingSubframes(includeSubframes)).leakRef());
+    return WebKit::toAPILeakingRef(API::String::create(WebKit::toProtectedImpl(page)->frameTextForTestingIncludingSubframes(includeSubframes)));
 }
diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.cpp
@@ -235,7 +235,7 @@ WKTypeID WKBundlePageOverlayGetTypeID()
 WKBundlePageOverlayRef WKBundlePageOverlayCreate(WKBundlePageOverlayClientBase* wkClient)
 {
     auto clientImpl = makeUnique<PageOverlayClientImpl>(wkClient);
-    SUPPRESS_UNCOUNTED_ARG return toAPI(&WebKit::WebPageOverlay::create(WTFMove(clientImpl)).leakRef());
+    return toAPILeakingRef(WebKit::WebPageOverlay::create(WTFMove(clientImpl)));
 }
 
 void WKBundlePageOverlaySetAccessibilityClient(WKBundlePageOverlayRef bundlePageOverlayRef, WKBundlePageOverlayAccessibilityClientBase* client)
diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.cpp
@@ -43,7 +43,7 @@ WKTypeID WKBundleRangeHandleGetTypeID()
 WKBundleRangeHandleRef WKBundleRangeHandleCreate(JSContextRef contextRef, JSObjectRef objectRef)
 {
     RefPtr<WebKit::InjectedBundleRangeHandle> rangeHandle = WebKit::InjectedBundleRangeHandle::getOrCreate(contextRef, objectRef);
-    SUPPRESS_UNCOUNTED_ARG return toAPI(rangeHandle.leakRef());
+    return toAPILeakingRef(WTFMove(rangeHandle));
 }
 
 WKRect WKBundleRangeHandleGetBoundingRectInWindowCoordinates(WKBundleRangeHandleRef rangeHandleRef)
@@ -55,11 +55,11 @@ WKRect WKBundleRangeHandleGetBoundingRectInWindowCoordinates(WKBundleRangeHandle
 WKImageRef WKBundleRangeHandleCopySnapshotWithOptions(WKBundleRangeHandleRef rangeHandleRef, WKSnapshotOptions options)
 {
     RefPtr<WebKit::WebImage> image = WebKit::toProtectedImpl(rangeHandleRef)->renderedImage(WebKit::toSnapshotOptions(options));
-    SUPPRESS_UNCOUNTED_ARG return toAPI(image.leakRef());
+    return toAPILeakingRef(WTFMove(image));
 }
 
 WKBundleFrameRef WKBundleRangeHandleCopyDocumentFrame(WKBundleRangeHandleRef rangeHandleRef)
 {
     RefPtr frame = WebKit::toProtectedImpl(rangeHandleRef)->document()->documentFrame();
-    SUPPRESS_UNCOUNTED_ARG return toAPI(frame.leakRef());
+    return toAPILeakingRef(WTFMove(frame));
 }
diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp b/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp
@@ -38,7 +38,7 @@ WKTypeID WKBundleScriptWorldGetTypeID()
 WKBundleScriptWorldRef WKBundleScriptWorldCreateWorld()
 {
     RefPtr<WebKit::InjectedBundleScriptWorld> world = WebKit::InjectedBundleScriptWorld::create(WebKit::ContentWorldIdentifier::generate());
-    SUPPRESS_UNCOUNTED_ARG return toAPI(world.leakRef());
+    return toAPILeakingRef(WTFMove(world));
 }
 
 WKBundleScriptWorldRef WKBundleScriptWorldNormalWorld()
diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/mac/WKBundleMac.mm b/Source/WebKit/WebProcess/InjectedBundle/API/c/mac/WKBundleMac.mm
@@ -31,5 +31,5 @@
 
 id WKBundleGetParameters(WKBundleRef bundle)
 {
-    return WebKit::toImpl(bundle)->bundleParameters();
+    return WebKit::toProtectedImpl(bundle)->bundleParameters();
 }
diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm b/Source/WebKit/WebProcess/InjectedBundle/API/c/mac/WKBundlePageBannerMac.mm
@@ -99,12 +99,12 @@ WKBundlePageBannerRef WKBundlePageBannerCreateBannerWithCALayer(CALayer *layer,
         return 0;
 
     auto clientImpl = makeUnique<WebKit::PageBannerClientImpl>(wkClient);
-    return toAPI(&WebKit::PageBanner::create(layer, height, WTFMove(clientImpl)).leakRef());
+    return toAPILeakingRef(WebKit::PageBanner::create(layer, height, WTFMove(clientImpl)));
 }
 
 CALayer *WKBundlePageBannerGetLayer(WKBundlePageBannerRef pageBanner)
 {
-    return WebKit::toImpl(pageBanner)->layer();
+    return WebKit::toProtectedImpl(pageBanner)->layer();
 }
 
 #endif // !PLATFORM(IOS_FAMILY)
diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKDOMDocument.mm b/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKDOMDocument.mm
@@ -69,7 +69,7 @@ - (WKDOMText *)createTextNode:(NSString *)data
 
 - (WKDOMElement *)body
 {
-    return WebKit::toWKDOMElement(downcast<WebCore::Document>(*_impl).bodyOrFrameset());
+    return WebKit::toWKDOMElement(downcast<WebCore::Document>(*_impl).protectedBodyOrFrameset().get());
 }
 
 - (WKDOMNode *)createDocumentFragmentWithMarkupString:(NSString *)markupString baseURL:(NSURL *)baseURL
diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKDOMInternals.h b/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKDOMInternals.h
@@ -89,12 +89,14 @@ DOMCache<WebCore::Range*, __unsafe_unretained WKDOMRange *>& WKDOMRangeCache();
 // -- Node and classes derived from Node. --
 
 WebCore::Node* toWebCoreNode(WKDOMNode *);
+RefPtr<WebCore::Node> toProtectedWebCoreNode(WKDOMNode *);
 WKDOMNode *toWKDOMNode(WebCore::Node*);
 
 WebCore::Element* toWebCoreElement(WKDOMElement *);
 WKDOMElement *toWKDOMElement(WebCore::Element*);
 
 WebCore::Document* toWebCoreDocument(WKDOMDocument *);
+RefPtr<WebCore::Document> toProtectedWebCoreDocument(WKDOMDocument *);
 WKDOMDocument *toWKDOMDocument(WebCore::Document*);
 
 WebCore::Text* toWebCoreText(WKDOMText *);
@@ -103,6 +105,7 @@ WKDOMText *toWKDOMText(WebCore::Text*);
 // -- Range. --
 
 WebCore::Range* toWebCoreRange(WKDOMRange *);
+RefPtr<WebCore::Range> toProtectedWebCoreRange(WKDOMRange *);
 WKDOMRange *toWKDOMRange(WebCore::Range*);
 
 } // namespace WebKit
diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm b/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm
diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKDOMNode.mm b/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKDOMNode.mm
diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKDOMRange.mm b/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKDOMRange.mm
diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.mm b/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.mm
diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm b/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm
diff --git a/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm b/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm

Original file line number	Diff line number	Diff line change
`@@ -4194,6 +4194,11 @@ HTMLElement* Document::bodyOrFrameset() const`
`4194`	`4194`	`return nullptr;`
`4195`	`4195`	`}`
`4196`	`4196`
	`4197`	`+RefPtr<HTMLElement> Document::protectedBodyOrFrameset() const`
	`4198`	`+{`
	`4199`	`+ return bodyOrFrameset();`
	`4200`	`+}`
	`4201`	`+`
`4197`	`4202`	`ExceptionOr<void> Document::setBodyOrFrameset(RefPtr<HTMLElement>&& newBody)`
`4198`	`4203`	`{`
`4199`	`4204`	`if (!is<HTMLBodyElement>(newBody) && !is<HTMLFrameSetElement>(newBody))`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ void WKBundlePostSynchronousMessage(WKBundleRef bundleRef, WKStringRef messageNa`
`73`	`73`	`RefPtr<API::Object> returnData;`
`74`	`74`	`WebKit::toProtectedImpl(bundleRef)->postSynchronousMessage(WebKit::toWTFString(messageNameRef), WebKit::toProtectedImpl(messageBodyRef).get(), returnData);`
`75`	`75`	`if (returnRetainedDataRef)`
`76`		`- SUPPRESS_UNCOUNTED_ARG *returnRetainedDataRef = WebKit::toAPI(returnData.leakRef());`
	`76`	`+ *returnRetainedDataRef = WebKit::toAPILeakingRef(WTFMove(returnData));`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`void WKBundleGarbageCollectJavaScriptObjects(WKBundleRef bundleRef)`
`@@ -153,7 +153,7 @@ void WKBundleReleaseMemory(WKBundleRef)`
`153`	`153`
`154`	`154`	`WKDataRef WKBundleCreateWKDataFromUInt8Array(WKBundleRef bundle, JSContextRef context, JSValueRef data)`
`155`	`155`	`{`
`156`		`- SUPPRESS_UNCOUNTED_ARG return WebKit::toAPI(&WebKit::toProtectedImpl(bundle)->createWebDataFromUint8Array(context, data).leakRef());`
	`156`	`+ return WebKit::toAPILeakingRef(WebKit::toProtectedImpl(bundle)->createWebDataFromUint8Array(context, data));`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`int WKBundleNumberOfPages(WKBundleRef bundleRef, WKBundleFrameRef frameRef, double pageWidthInPixels, double pageHeightInPixels)`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ WKTypeID WKBundleDOMWindowExtensionGetTypeID()`
`40`	`40`	`WKBundleDOMWindowExtensionRef WKBundleDOMWindowExtensionCreate(WKBundleFrameRef frame, WKBundleScriptWorldRef world)`
`41`	`41`	`{`
`42`	`42`	`RefPtr<WebKit::InjectedBundleDOMWindowExtension> extension = WebKit::InjectedBundleDOMWindowExtension::create(WebKit::toProtectedImpl(frame).get(), WebKit::toProtectedImpl(world).get());`
`43`		`- SUPPRESS_UNCOUNTED_ARG return toAPI(extension.leakRef());`
	`43`	`+ return toAPILeakingRef(WTFMove(extension));`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`WKBundleFrameRef WKBundleDOMWindowExtensionGetFrame(WKBundleDOMWindowExtensionRef extension)`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ WKFrameLoadState WKBundleFrameGetFrameLoadState(WKBundleFrameRef frameRef)`
`95`	`95`
`96`	`96`	`WKArrayRef WKBundleFrameCopyChildFrames(WKBundleFrameRef frameRef)`
`97`	`97`	`{`
`98`		`- SUPPRESS_UNCOUNTED_ARG return WebKit::toAPI(&WebKit::toImpl(frameRef)->childFrames().leakRef());`
	`98`	`+ return WebKit::toAPILeakingRef(WebKit::toProtectedImpl(frameRef)->childFrames());`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`JSGlobalContextRef WKBundleFrameGetJavaScriptContext(WKBundleFrameRef frameRef)`
`@@ -140,7 +140,7 @@ unsigned WKBundleFrameGetPendingUnloadCount(WKBundleFrameRef frameRef)`
`140`	`140`
`141`	`141`	`WKBundlePageRef WKBundleFrameGetPage(WKBundleFrameRef frameRef)`
`142`	`142`	`{`
`143`		`- return toAPI(WebKit::toProtectedImpl(frameRef)->page());`
	`143`	`+ return toAPI(WebKit::toProtectedImpl(frameRef)->protectedPage().get());`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`void WKBundleFrameStopLoading(WKBundleFrameRef frameRef)`
`@@ -270,7 +270,7 @@ bool WKBundleFrameCallShouldCloseOnWebView(WKBundleFrameRef frameRef)`
`270`	`270`	`WKBundleHitTestResultRef WKBundleFrameCreateHitTestResult(WKBundleFrameRef frameRef, WKPoint point)`
`271`	`271`	`{`
`272`	`272`	`ASSERT(frameRef);`
`273`		`- return WebKit::toAPI(WebKit::toProtectedImpl(frameRef)->hitTest(WebKit::toIntPoint(point)).leakRef());`
	`273`	`+ return WebKit::toAPILeakingRef(WebKit::toProtectedImpl(frameRef)->hitTest(WebKit::toIntPoint(point)));`
`274`	`274`	`}`
`275`	`275`
`276`	`276`	`WKSecurityOriginRef WKBundleFrameCopySecurityOrigin(WKBundleFrameRef frameRef)`
Original file line number	Diff line number	Diff line change
`@@ -42,13 +42,13 @@ WKTypeID WKBundleHitTestResultGetTypeID()`
`42`	`42`	`WKBundleNodeHandleRef WKBundleHitTestResultCopyNodeHandle(WKBundleHitTestResultRef hitTestResultRef)`
`43`	`43`	`{`
`44`	`44`	`RefPtr<WebKit::InjectedBundleNodeHandle> nodeHandle = WebKit::toProtectedImpl(hitTestResultRef)->nodeHandle();`
`45`		`- SUPPRESS_UNCOUNTED_ARG return toAPI(nodeHandle.leakRef());`
	`45`	`+ return toAPILeakingRef(WTFMove(nodeHandle));`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`WKBundleNodeHandleRef WKBundleHitTestResultCopyURLElementHandle(WKBundleHitTestResultRef hitTestResultRef)`
`49`	`49`	`{`
`50`	`50`	`RefPtr<WebKit::InjectedBundleNodeHandle> urlElementNodeHandle = WebKit::toProtectedImpl(hitTestResultRef)->urlElementHandle();`
`51`		`- SUPPRESS_UNCOUNTED_ARG return toAPI(urlElementNodeHandle.leakRef());`
	`51`	`+ return toAPILeakingRef(WTFMove(urlElementNodeHandle));`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`WKBundleFrameRef WKBundleHitTestResultGetFrame(WKBundleHitTestResultRef)`