Minor adoption of queueTaskKeepingNodeAlive()

https://bugs.webkit.org/show_bug.cgi?id=309352

Reviewed by Ryosuke Niwa.

We also rename queueTaskKeepingThisNodeAlive() to
queueTaskKeepingNodeAlive() as you now need to pass this as an argument
to make the method work with Safer CPP. No functional changes and
therefore no tests.

Canonical link: https://commits.webkit.org/308882@main

Author: annevk

Source/WebCore/SaferCPPExpectations/UncountedLambdaCapturesCheckerExpectations

@@ -18,7 +18,6 @@ animation/KeyframeEffect.cpp
 contentextensions/ContentExtensionsBackend.cpp
 crypto/SubtleCrypto.cpp
 css/CSSValue.cpp
-dom/ContentVisibilityDocumentState.cpp
 dom/CustomElementDefaultARIA.cpp
 dom/RejectedPromiseTracker.cpp
 inspector/agents/page/PageDOMDebuggerAgent.cpp

Source/WebCore/dom/ContentVisibilityDocumentState.cpp

@@ -168,14 +168,15 @@ bool ContentVisibilityDocumentState::checkRelevancyOfContentVisibilityElement(El
     auto isSkippedContent = target.isRelevantToUser() ? IsSkippedContent::No : IsSkippedContent::Yes;
     target.invalidateStyle();
     updateAnimations(target, wasSkippedContent, isSkippedContent);
-    target.queueTaskKeepingThisNodeAlive(TaskSource::DOMManipulation, [&, isSkippedContent] {
-        if (target.isConnected()) {
-            ContentVisibilityAutoStateChangeEvent::Init init {
-                { false, false, false },
-                isSkippedContent == IsSkippedContent::Yes
-            };
-            target.dispatchEvent(ContentVisibilityAutoStateChangeEvent::create(eventNames().contentvisibilityautostatechangeEvent, WTF::move(init)));
-        }
+    Node::queueTaskKeepingNodeAlive(target, TaskSource::DOMManipulation, [isSkippedContent](auto& element) {
+        if (!element.isConnected())
+            return;
+
+        ContentVisibilityAutoStateChangeEvent::Init init {
+            { false, false, false },
+            isSkippedContent == IsSkippedContent::Yes
+        };
+        element.dispatchEvent(ContentVisibilityAutoStateChangeEvent::create(eventNames().contentvisibilityautostatechangeEvent, WTF::move(init)));
     });
     return true;
 }

Source/WebCore/dom/Node.cpp

@@ -44,11 +44,9 @@
 #include "ElementTraversal.h"
 #include "EventDispatcher.h"
 #include "EventHandler.h"
-#include "EventLoop.h"
 #include "EventNames.h"
 #include "EventTargetInlines.h"
 #include "FrameInlines.h"
-#include "GCReachableRef.h"
 #include "HTMLAreaElement.h"
 #include "HTMLBodyElement.h"
 #include "HTMLDialogElement.h"
@@ -1480,17 +1478,10 @@ Node& Node::getRootNode(const GetRootNodeOptions& options) const
     return options.composed ? shadowIncludingRoot() : rootNode();
 }
 
-void Node::queueTaskKeepingThisNodeAlive(TaskSource source, Function<void ()>&& task)
-{
-    document().eventLoop().queueTask(source, [protectedThis = GCReachableRef(*this), task = WTF::move(task)] () {
-        task();
-    });
-}
-
 void Node::queueTaskToDispatchEvent(TaskSource source, Ref<Event>&& event)
 {
-    queueTaskKeepingThisNodeAlive(source, [protectedThis = Ref { *this }, event = WTF::move(event)]() {
-        protectedThis->dispatchEvent(event);
+    queueTaskKeepingNodeAlive(*this, source, [event = WTF::move(event)](Node& node) {
+        node.dispatchEvent(event);
     });
 }
 

Source/WebCore/dom/Node.h

@@ -321,7 +321,7 @@ class Node : public EventTarget, public CanMakeCheckedPtr<Node> {
     inline WebCoreOpaqueRoot opaqueRoot() const;
     WebCoreOpaqueRoot NODELETE traverseToOpaqueRoot() const;
 
-    void queueTaskKeepingThisNodeAlive(TaskSource, Function<void ()>&&);
+    template<typename T, typename Task> static void queueTaskKeepingNodeAlive(T&, TaskSource, Task&&);
     void queueTaskToDispatchEvent(TaskSource, Ref<Event>&&);
 
     // Use when it's guaranteed to that shadowHost is null.

Source/WebCore/dom/NodeInlines.h

@@ -23,6 +23,8 @@
 #include <WebCore/CharacterData.h>
 #include <WebCore/Document.h>
 #include <WebCore/Element.h>
+#include <WebCore/EventLoop.h>
+#include <WebCore/GCReachableRef.h>
 #include <WebCore/InspectorInstrumentationPublic.h>
 #include <WebCore/LayoutRect.h>
 #include <WebCore/Node.h>
@@ -273,4 +275,13 @@ inline void collectChildNodes(Node& node, NodeVector& children)
         children.append(*child);
 }
 
+template<typename T, typename Task>
+void Node::queueTaskKeepingNodeAlive(T& node, TaskSource source, Task&& task)
+{
+    protect(protect(node.document())->eventLoop())->queueTask(source, [protectedThis = GCReachableRef(node), task = std::forward<Task>(task)]() mutable {
+        // Static analyzer does not know about GCReachableRef.
+        SUPPRESS_UNCOUNTED_ARG task(protectedThis.get());
+    });
+}
+
 } // namespace WebCore

Source/WebCore/dom/ToggleEventTask.cpp

@@ -27,6 +27,7 @@
 #include "ToggleEventTask.h"
 
 #include "EventNames.h"
+#include "NodeInlines.h"
 #include "TaskSource.h"
 #include "ToggleEvent.h"
 
@@ -47,7 +48,7 @@ void ToggleEventTask::queue(ToggleState oldState, ToggleState newState, Element*
         return;
 
     m_data = { oldState, newState, source };
-    element->queueTaskKeepingThisNodeAlive(TaskSource::DOMManipulation, [task = Ref { *this }, element, newState] {
+    Node::queueTaskKeepingNodeAlive(*element, TaskSource::DOMManipulation, [task = Ref { *this }, newState](auto& element) {
         if (!task->m_data || task->m_data->newState != newState)
             return;
 
@@ -60,7 +61,7 @@ void ToggleEventTask::queue(ToggleState oldState, ToggleState newState, Element*
         init.oldState = stringForState(data.oldState);
         init.newState = stringForState(data.newState);
         init.source = data.source;
-        element->dispatchEvent(ToggleEvent::create(eventNames().toggleEvent, init, Event::IsCancelable::No));
+        element.dispatchEvent(ToggleEvent::create(eventNames().toggleEvent, init, Event::IsCancelable::No));
     });
 }
 

Source/WebCore/html/HTMLDialogElement.cpp

@@ -29,7 +29,6 @@
 #include "ContainerNodeInlines.h"
 #include "CSSSelector.h"
 #include "DocumentPage.h"
-#include "EventLoop.h"
 #include "EventNames.h"
 #include "FocusOptions.h"
 #include "HTMLButtonElement.h"
@@ -206,7 +205,7 @@ void HTMLDialogElement::requestClose(const String& returnValue, Element* source)
     if (!isOpen())
         return;
 
-    auto cancelEvent = Event::create(eventNames().cancelEvent, Event::CanBubble::No, Event::IsCancelable::Yes);
+    Ref cancelEvent = Event::create(eventNames().cancelEvent, Event::CanBubble::No, Event::IsCancelable::Yes);
     dispatchEvent(cancelEvent);
     if (!cancelEvent->defaultPrevented())
         close(returnValue, source);
@@ -247,14 +246,11 @@ bool HTMLDialogElement::handleCommandInternal(HTMLButtonElement& invoker, const
 
 void HTMLDialogElement::queueCancelTask()
 {
-    queueTaskKeepingThisNodeAlive(TaskSource::UserInteraction, [weakThis = WeakPtr { *this }] {
-        RefPtr protectedThis = weakThis.get();
-        if (!protectedThis)
-            return;
-        auto cancelEvent = Event::create(eventNames().cancelEvent, Event::CanBubble::No, Event::IsCancelable::Yes);
-        protectedThis->dispatchEvent(cancelEvent);
+    queueTaskKeepingNodeAlive(*this, TaskSource::UserInteraction, [](auto& dialog) {
+        Ref cancelEvent = Event::create(eventNames().cancelEvent, Event::CanBubble::No, Event::IsCancelable::Yes);
+        dialog.dispatchEvent(cancelEvent);
         if (!cancelEvent->defaultPrevented())
-            protectedThis->close(nullString());
+            dialog.close(nullString());
     });
 }
 

Source/WebCore/html/HTMLPlugInElement.cpp

@@ -31,20 +31,17 @@
 #include "CommonVM.h"
 #include "ContainerNodeInlines.h"
 #include "ContentSecurityPolicy.h"
-#include "DocumentEventLoop.h"
 #include "DocumentLoader.h"
 #include "DocumentPage.h"
 #include "DocumentSecurityOrigin.h"
 #include "DocumentView.h"
 #include "ElementInlines.h"
 #include "Event.h"
 #include "EventHandler.h"
-#include "EventLoop.h"
 #include "EventNames.h"
 #include "FrameDestructionObserverInlines.h"
 #include "FrameLoader.h"
 #include "FrameTree.h"
-#include "GCReachableRef.h"
 #include "HTMLImageLoader.h"
 #include "HTMLNames.h"
 #include "HitTestResult.h"
@@ -463,13 +460,13 @@ bool HTMLPlugInElement::requestObject(const String& relativeURL, const String& m
     if (ScriptDisallowedScope::InMainThread::isScriptAllowed())
         return document->frame()->loader().subframeLoader().requestObject(*this, relativeURL, getNameAttribute(), mimeType, paramNames, paramValues);
 
-    protect(document->eventLoop())->queueTask(TaskSource::Networking, [this, protectedThis = Ref { *this }, relativeURL, nameAttribute = getNameAttribute(), mimeType, paramNames, paramValues, document]() mutable {
-        if (!this->isConnected() || &this->document() != document.ptr())
+    queueTaskKeepingNodeAlive(*this, TaskSource::Networking, [relativeURL, nameAttribute = getNameAttribute(), mimeType, paramNames, paramValues, document](auto& element) mutable {
+        if (!element.isConnected() || &element.document() != document.ptr())
             return;
-        RefPtr frame = this->document().frame();
+        RefPtr frame = element.document().frame();
         if (!frame)
             return;
-        frame->loader().subframeLoader().requestObject(*this, relativeURL, nameAttribute, mimeType, paramNames, paramValues);
+        frame->loader().subframeLoader().requestObject(element, relativeURL, nameAttribute, mimeType, paramNames, paramValues);
     });
     return true;
 }
@@ -514,8 +511,8 @@ void HTMLPlugInElement::scheduleUpdateForAfterStyleResolution()
 
     m_hasUpdateScheduledForAfterStyleResolution = true;
 
-    protect(document->eventLoop())->queueTask(TaskSource::DOMManipulation, [element = GCReachableRef { *this }] {
-        element->updateAfterStyleResolution();
+    queueTaskKeepingNodeAlive(*this, TaskSource::DOMManipulation, [](auto& element) {
+        element.updateAfterStyleResolution();
     });
 }
 

Source/WebCore/html/HTMLTextFormControlElement.cpp

@@ -38,10 +38,8 @@
 #include "ElementInlines.h"
 #include "ElementTextDirection.h"
 #include "Event.h"
-#include "EventLoop.h"
 #include "EventNames.h"
 #include "FrameSelection.h"
-#include "GCReachableRef.h"
 #include "HTMLBRElement.h"
 #include "HTMLFormElement.h"
 #include "HTMLInputElement.h"
@@ -594,9 +592,9 @@ void HTMLTextFormControlElement::scheduleSelectionChangeEvent()
         return;
 
     m_hasScheduledSelectionChangeEvent = true;
-    document().eventLoop().queueTask(TaskSource::UserInteraction, [textControl = GCReachableRef { *this }] {
-        textControl->m_hasScheduledSelectionChangeEvent = false;
-        textControl->dispatchEvent(Event::create(eventNames().selectionchangeEvent, Event::CanBubble::Yes, Event::IsCancelable::No));
+    queueTaskKeepingNodeAlive(*this, TaskSource::UserInteraction, [](auto& textControl) {
+        textControl.m_hasScheduledSelectionChangeEvent = false;
+        textControl.dispatchEvent(Event::create(eventNames().selectionchangeEvent, Event::CanBubble::Yes, Event::IsCancelable::No));
     });
 }