From 10507bcb292c24fee4a4dee3fd04edb3a338fe83 Mon Sep 17 00:00:00 2001
From: Luke Warlow <lwarlow@igalia.com>
Date: Wed, 24 Jul 2024 04:42:57 -0700
Subject: [PATCH] Remove trusted types enforcement from DOM node APIs
 https://bugs.webkit.org/show_bug.cgi?id=276881

Reviewed by Ryosuke Niwa.

The enforcement of Trusted Types in various node manipulation APIs in DOM
was based on a previous model for protecting script elements.

This patch removes it as its not needed.

See https://github.com/whatwg/dom/pull/1299 and https://github.com/w3c/trusted-types/issues/537

* LayoutTests/imported/w3c/web-platform-tests/trusted-types/Node-multiple-arguments-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/trusted-types/Node-multiple-arguments-tt-enforced-expected.txt: Added.
* LayoutTests/imported/w3c/web-platform-tests/trusted-types/Node-multiple-arguments-tt-enforced.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/trusted-types/block-Node-multiple-arguments.html.
* Source/WebCore/dom/ChildNode.idl:
* Source/WebCore/dom/ContainerNode.cpp:
(WebCore::ContainerNode::append):
(WebCore::ContainerNode::prepend):
(WebCore::ContainerNode::replaceChildren):
* Source/WebCore/dom/ContainerNode.h:
* Source/WebCore/dom/Node.cpp:
(WebCore::nodeSetPreTransformedFromNodeOrStringVector):
(WebCore::Node::convertNodesOrStringsIntoNode):
(WebCore::Node::convertNodesOrStringsIntoNodeVector):
(WebCore::Node::before):
(WebCore::Node::after):
(WebCore::Node::replaceWith):
(WebCore::nodeSetPreTransformedFromNodeOrStringOrTrustedScriptVector): Deleted.
(WebCore::Node::convertNodesOrStringsOrTrustedScriptsIntoNode): Deleted.
(WebCore::Node::convertNodesOrStringsOrTrustedScriptsIntoNodeVector): Deleted.
* Source/WebCore/dom/Node.h:
* Source/WebCore/dom/ParentNode.idl:
* Source/WebCore/dom/TrustedType.cpp:
(WebCore::processNodeOrStringAsTrustedType): Deleted.
* Source/WebCore/dom/TrustedType.h:

Canonical link: https://commits.webkit.org/281285@main
---
 .../Node-multiple-arguments-expected.txt      |   2 +
 ...ultiple-arguments-tt-enforced-expected.txt | 202 ++++++++++++++++++
 ... Node-multiple-arguments-tt-enforced.html} |  10 +-
 Source/WebCore/dom/ChildNode.idl              |   6 +-
 Source/WebCore/dom/ContainerNode.cpp          |  12 +-
 Source/WebCore/dom/ContainerNode.h            |   6 +-
 Source/WebCore/dom/Node.cpp                   |  79 +++----
 Source/WebCore/dom/Node.h                     |  15 +-
 Source/WebCore/dom/ParentNode.idl             |   6 +-
 Source/WebCore/dom/TrustedType.cpp            |  28 +--
 Source/WebCore/dom/TrustedType.h              |   5 -
 11 files changed, 256 insertions(+), 115 deletions(-)
 create mode 100644 LayoutTests/imported/w3c/web-platform-tests/trusted-types/Node-multiple-arguments-tt-enforced-expected.txt
 rename LayoutTests/imported/w3c/web-platform-tests/trusted-types/{block-Node-multiple-arguments.html => Node-multiple-arguments-tt-enforced.html} (92%)

diff --git a/LayoutTests/imported/w3c/web-platform-tests/trusted-types/Node-multiple-arguments-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/trusted-types/Node-multiple-arguments-expected.txt
index 1732636fcc5c5..70830ba301ec8 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/trusted-types/Node-multiple-arguments-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/trusted-types/Node-multiple-arguments-expected.txt
@@ -22,6 +22,7 @@
 'mixed';
 'mixed';
 'mixed';
+'mixed';
 'mixed';'script';
 'mixed';'script';
 'mixed';'script';
@@ -31,6 +32,7 @@
 'script';
 'script';
 'script';
+'script';
 
 PASS replaceWith('createScript';) on <div> should pass
 PASS after('createScript';) on <div> should pass
diff --git a/LayoutTests/imported/w3c/web-platform-tests/trusted-types/Node-multiple-arguments-tt-enforced-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/trusted-types/Node-multiple-arguments-tt-enforced-expected.txt
new file mode 100644
index 0000000000000..cbb87a7b67425
--- /dev/null
+++ b/LayoutTests/imported/w3c/web-platform-tests/trusted-types/Node-multiple-arguments-tt-enforced-expected.txt
@@ -0,0 +1,202 @@
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+CONSOLE MESSAGE: This requires a TrustedScript value else it violates the following Content Security Policy directive: "require-trusted-types-for 'script'"
+'createScript';
+'createScript';
+'createScript';
+'createScript';
+'createScript';
+'createScript #1';'#2;'
+'createScript #1';'#2;'
+'createScript #1';'#2;'
+'createScript #1';'#2;'
+'createScript #1';'#2;'
+'plain text';
+'plain text';
+'plain text';
+'plain text';
+'plain text';
+'plain text #1';'plain text #2';
+'plain text #1';'plain text #2';
+'plain text #1';'plain text #2';
+'plain text #1';'plain text #2';
+'plain text #1';'plain text #2';
+'mixed';
+'mixed';
+'mixed';
+'mixed';
+'mixed';
+'mixed';'script';
+'mixed';'script';
+'mixed';'script';
+'mixed';'script';
+'mixed';'script';
+'script';
+'script';
+'script';
+'script';
+'script';
+
+PASS replaceWith('createScript';) on <div> should pass
+PASS after('createScript';) on <div> should pass
+PASS before('createScript';) on <div> should pass
+PASS append('createScript';) on <div> should pass
+PASS prepend('createScript';) on <div> should pass
+PASS replaceWith('createScript #1';,'#2;') on <div> should pass
+PASS after('createScript #1';,'#2;') on <div> should pass
+PASS before('createScript #1';,'#2;') on <div> should pass
+PASS append('createScript #1';,'#2;') on <div> should pass
+PASS prepend('createScript #1';,'#2;') on <div> should pass
+PASS replaceWith('plain text';) on <div> should pass
+PASS after('plain text';) on <div> should pass
+PASS before('plain text';) on <div> should pass
+PASS append('plain text';) on <div> should pass
+PASS prepend('plain text';) on <div> should pass
+PASS replaceWith('plain text #1';,'plain text #2';) on <div> should pass
+PASS after('plain text #1';,'plain text #2';) on <div> should pass
+PASS before('plain text #1';,'plain text #2';) on <div> should pass
+PASS append('plain text #1';,'plain text #2';) on <div> should pass
+PASS prepend('plain text #1';,'plain text #2';) on <div> should pass
+PASS replaceWith([object Text]) on <div> should pass
+PASS after([object Text]) on <div> should pass
+PASS before([object Text]) on <div> should pass
+PASS append([object Text]) on <div> should pass
+PASS prepend([object Text]) on <div> should pass
+PASS replaceWith([object Text],[object Text]) on <div> should pass
+PASS after([object Text],[object Text]) on <div> should pass
+PASS before([object Text],[object Text]) on <div> should pass
+PASS append([object Text],[object Text]) on <div> should pass
+PASS prepend([object Text],[object Text]) on <div> should pass
+PASS replaceWith('mixed';,[object Text]) on <div> should pass
+PASS after('mixed';,[object Text]) on <div> should pass
+PASS before('mixed';,[object Text]) on <div> should pass
+PASS append('mixed';,[object Text]) on <div> should pass
+PASS prepend('mixed';,[object Text]) on <div> should pass
+PASS replaceWith('mixed';,'script';) on <div> should pass
+PASS after('mixed';,'script';) on <div> should pass
+PASS before('mixed';,'script';) on <div> should pass
+PASS append('mixed';,'script';) on <div> should pass
+PASS prepend('mixed';,'script';) on <div> should pass
+PASS replaceWith([object Text],'script';) on <div> should pass
+PASS after([object Text],'script';) on <div> should pass
+PASS before([object Text],'script';) on <div> should pass
+PASS append([object Text],'script';) on <div> should pass
+PASS prepend([object Text],'script';) on <div> should pass
+PASS replaceWith('createScript';) on <script> should pass
+PASS after('createScript';) on <script> should pass
+PASS before('createScript';) on <script> should pass
+PASS append('createScript';) on <script> should pass
+PASS prepend('createScript';) on <script> should pass
+PASS replaceWith('createScript #1';,'#2;') on <script> should pass
+PASS after('createScript #1';,'#2;') on <script> should pass
+PASS before('createScript #1';,'#2;') on <script> should pass
+PASS append('createScript #1';,'#2;') on <script> should pass
+PASS prepend('createScript #1';,'#2;') on <script> should pass
+PASS replaceWith('plain text';) on <script> should pass
+PASS after('plain text';) on <script> should pass
+PASS before('plain text';) on <script> should pass
+PASS append('plain text';) on <script> should pass
+PASS prepend('plain text';) on <script> should pass
+PASS replaceWith('plain text #1';,'plain text #2';) on <script> should pass
+PASS after('plain text #1';,'plain text #2';) on <script> should pass
+PASS before('plain text #1';,'plain text #2';) on <script> should pass
+PASS append('plain text #1';,'plain text #2';) on <script> should pass
+PASS prepend('plain text #1';,'plain text #2';) on <script> should pass
+PASS replaceWith([object Text]) on <script> should pass
+PASS after([object Text]) on <script> should pass
+PASS before([object Text]) on <script> should pass
+PASS append([object Text]) on <script> should pass
+PASS prepend([object Text]) on <script> should pass
+PASS replaceWith([object Text],[object Text]) on <script> should pass
+PASS after([object Text],[object Text]) on <script> should pass
+PASS before([object Text],[object Text]) on <script> should pass
+PASS append([object Text],[object Text]) on <script> should pass
+PASS prepend([object Text],[object Text]) on <script> should pass
+PASS replaceWith('mixed';,[object Text]) on <script> should pass
+PASS after('mixed';,[object Text]) on <script> should pass
+PASS before('mixed';,[object Text]) on <script> should pass
+PASS append('mixed';,[object Text]) on <script> should pass
+PASS prepend('mixed';,[object Text]) on <script> should pass
+PASS replaceWith('mixed';,'script';) on <script> should pass
+PASS after('mixed';,'script';) on <script> should pass
+PASS before('mixed';,'script';) on <script> should pass
+PASS append('mixed';,'script';) on <script> should pass
+PASS prepend('mixed';,'script';) on <script> should pass
+PASS replaceWith([object Text],'script';) on <script> should pass
+PASS after([object Text],'script';) on <script> should pass
+PASS before([object Text],'script';) on <script> should pass
+PASS append([object Text],'script';) on <script> should pass
+PASS prepend([object Text],'script';) on <script> should pass
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/trusted-types/block-Node-multiple-arguments.html b/LayoutTests/imported/w3c/web-platform-tests/trusted-types/Node-multiple-arguments-tt-enforced.html
similarity index 92%
rename from LayoutTests/imported/w3c/web-platform-tests/trusted-types/block-Node-multiple-arguments.html
rename to LayoutTests/imported/w3c/web-platform-tests/trusted-types/Node-multiple-arguments-tt-enforced.html
index c3e7671534e70..3a82c264ae438 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/trusted-types/block-Node-multiple-arguments.html
+++ b/LayoutTests/imported/w3c/web-platform-tests/trusted-types/Node-multiple-arguments-tt-enforced.html
@@ -30,23 +30,21 @@
   const pass_args = [
     [ policy.createScript("'createScript';") ],
     [ policy.createScript("'createScript #1';"), policy.createScript("'#2;'") ],
-  ];
-  const fail_args = [
     [ "'plain text';" ],
     [ "'plain text #1';", "'plain text #2';" ],
     [ document.createTextNode("'node';") ],
     [ document.createTextNode("'node #1';"),
-      document.createTextNode("'node #2';") ],
+        document.createTextNode("'node #2';") ],
     [ "'mixed';", document.createTextNode("'node';") ],
     [ "'mixed';", policy.createScript("'script';") ],
     [ document.createTextNode("'node';"),
-      policy.createScript("'script';") ],
+        policy.createScript("'script';") ],
   ];
-  const all_args = [].concat(pass_args).concat(fail_args);
+  const all_args = [].concat(pass_args);
 
   for (const target of targets) {
     for (const args of all_args) {
-      var should_fail = target == "script" && fail_args.indexOf(args) != -1;
+      var should_fail = false;
       var fail_string = should_fail ? "fail" : "pass";
 
       for (const setter of [container.replaceWith, container.after, container.before]) {
diff --git a/Source/WebCore/dom/ChildNode.idl b/Source/WebCore/dom/ChildNode.idl
index 21f14f4d09a98..358b1aad9c46b 100644
--- a/Source/WebCore/dom/ChildNode.idl
+++ b/Source/WebCore/dom/ChildNode.idl
@@ -20,8 +20,8 @@
 
 // https://dom.spec.whatwg.org/#childnode
 interface mixin ChildNode {
-    [CEReactions=Needed, Unscopable] undefined before((Node or DOMString or TrustedScript)... nodes);
-    [CEReactions=Needed, Unscopable] undefined after((Node or DOMString or TrustedScript)... nodes);
-    [CEReactions=Needed, Unscopable] undefined replaceWith((Node or DOMString or TrustedScript)... nodes);
+    [CEReactions=Needed, Unscopable] undefined before((Node or DOMString)... nodes);
+    [CEReactions=Needed, Unscopable] undefined after((Node or DOMString)... nodes);
+    [CEReactions=Needed, Unscopable] undefined replaceWith((Node or DOMString)... nodes);
     [CEReactions=Needed, Unscopable] undefined remove();
 };
diff --git a/Source/WebCore/dom/ContainerNode.cpp b/Source/WebCore/dom/ContainerNode.cpp
index d3372f8d09d15..3737109a1299e 100644
--- a/Source/WebCore/dom/ContainerNode.cpp
+++ b/Source/WebCore/dom/ContainerNode.cpp
@@ -1164,9 +1164,9 @@ unsigned ContainerNode::childElementCount() const
     return std::distance(children.begin(), { });
 }
 
-ExceptionOr<void> ContainerNode::append(FixedVector<NodeOrStringOrTrustedScript>&& vector)
+ExceptionOr<void> ContainerNode::append(FixedVector<NodeOrString>&& vector)
 {
-    auto result = convertNodesOrStringsOrTrustedScriptsIntoNodeVector(this, WTFMove(vector));
+    auto result = convertNodesOrStringsIntoNodeVector(WTFMove(vector));
     if (result.hasException())
         return result.releaseException();
 
@@ -1185,9 +1185,9 @@ ExceptionOr<void> ContainerNode::append(FixedVector<NodeOrStringOrTrustedScript>
     return { };
 }
 
-ExceptionOr<void> ContainerNode::prepend(FixedVector<NodeOrStringOrTrustedScript>&& vector)
+ExceptionOr<void> ContainerNode::prepend(FixedVector<NodeOrString>&& vector)
 {
-    auto result = convertNodesOrStringsOrTrustedScriptsIntoNodeVector(this, WTFMove(vector));
+    auto result = convertNodesOrStringsIntoNodeVector(WTFMove(vector));
     if (result.hasException())
         return result.releaseException();
 
@@ -1208,9 +1208,9 @@ ExceptionOr<void> ContainerNode::prepend(FixedVector<NodeOrStringOrTrustedScript
 }
 
 // https://dom.spec.whatwg.org/#dom-parentnode-replacechildren
-ExceptionOr<void> ContainerNode::replaceChildren(FixedVector<NodeOrStringOrTrustedScript>&& vector)
+ExceptionOr<void> ContainerNode::replaceChildren(FixedVector<NodeOrString>&& vector)
 {
-    auto result = convertNodesOrStringsOrTrustedScriptsIntoNodeVector(this, WTFMove(vector));
+    auto result = convertNodesOrStringsIntoNodeVector(WTFMove(vector));
     if (result.hasException())
         return result.releaseException();
     auto newChildren = result.releaseReturnValue();
diff --git a/Source/WebCore/dom/ContainerNode.h b/Source/WebCore/dom/ContainerNode.h
index 80c8d63a23692..361a7264d5842 100644
--- a/Source/WebCore/dom/ContainerNode.h
+++ b/Source/WebCore/dom/ContainerNode.h
@@ -135,10 +135,10 @@ class ContainerNode : public Node {
     WEBCORE_EXPORT Element* firstElementChild() const;
     WEBCORE_EXPORT Element* lastElementChild() const;
     WEBCORE_EXPORT unsigned childElementCount() const;
-    ExceptionOr<void> append(FixedVector<NodeOrStringOrTrustedScript>&&);
-    ExceptionOr<void> prepend(FixedVector<NodeOrStringOrTrustedScript>&&);
+    ExceptionOr<void> append(FixedVector<NodeOrString>&&);
+    ExceptionOr<void> prepend(FixedVector<NodeOrString>&&);
 
-    ExceptionOr<void> replaceChildren(FixedVector<NodeOrStringOrTrustedScript>&&);
+    ExceptionOr<void> replaceChildren(FixedVector<NodeOrString>&&);
 
     ExceptionOr<void> ensurePreInsertionValidity(Node& newChild, Node* refChild);
     ExceptionOr<void> ensurePreInsertionValidityForPhantomDocumentFragment(NodeVector& newChildren, Node* refChild = nullptr);
diff --git a/Source/WebCore/dom/Node.cpp b/Source/WebCore/dom/Node.cpp
index b5eaa9ae8ea13..e4182b5ff724b 100644
--- a/Source/WebCore/dom/Node.cpp
+++ b/Source/WebCore/dom/Node.cpp
@@ -49,7 +49,6 @@
 #include "HTMLDialogElement.h"
 #include "HTMLElement.h"
 #include "HTMLImageElement.h"
-#include "HTMLScriptElement.h"
 #include "HTMLSlotElement.h"
 #include "HTMLStyleElement.h"
 #include "InputEvent.h"
@@ -83,8 +82,7 @@
 #include "TemplateContentDocumentFragment.h"
 #include "TextEvent.h"
 #include "TextManipulationController.h"
-#include "TouchEvent.h"
-#include "TrustedType.h"
+#include "WebCoreOpaqueRoot.h"
 #include "WebCoreOpaqueRoot.h"
 #include "WheelEvent.h"
 #include "XMLNSNames.h"
@@ -568,14 +566,13 @@ ExceptionOr<void> Node::appendChild(Node& newChild)
     return Exception { ExceptionCode::HierarchyRequestError };
 }
 
-static HashSet<RefPtr<Node>> nodeSetPreTransformedFromNodeOrStringOrTrustedScriptVector(const FixedVector<NodeOrStringOrTrustedScript>& vector)
+static HashSet<RefPtr<Node>> nodeSetPreTransformedFromNodeOrStringVector(const FixedVector<NodeOrString>& vector)
 {
     HashSet<RefPtr<Node>> nodeSet;
     for (const auto& variant : vector) {
         WTF::switchOn(variant,
             [&] (const RefPtr<Node>& node) { nodeSet.add(const_cast<Node*>(node.get())); },
-            [] (const String&) { },
-            [] (const RefPtr<TrustedScript>&) { }
+            [] (const String&) { }
         );
     }
     return nodeSet;
@@ -600,34 +597,18 @@ static RefPtr<Node> firstFollowingSiblingNotInNodeSet(Node& context, const HashS
 }
 
 // https://dom.spec.whatwg.org/#converting-nodes-into-a-node
-ExceptionOr<RefPtr<Node>> Node::convertNodesOrStringsOrTrustedScriptsIntoNode(RefPtr<Node> parent, FixedVector<NodeOrStringOrTrustedScript>&& vector)
+ExceptionOr<RefPtr<Node>> Node::convertNodesOrStringsIntoNode(FixedVector<NodeOrString>&& nodeOrStringVector)
 {
-    if (vector.isEmpty())
+    if (nodeOrStringVector.isEmpty())
         return nullptr;
 
     Ref document = this->document();
-    NodeVector nodes;
-    auto trustedTypesEnabled = document->scriptExecutionContext()->settingsValues().trustedTypesEnabled;
-    for (auto& variant : vector) {
-        if (trustedTypesEnabled) {
-            auto textNodeHolder = processNodeOrStringAsTrustedType(document, parent, variant);
-            if (textNodeHolder.hasException())
-                return textNodeHolder.releaseException();
-
-            if (RefPtr textNode = textNodeHolder.releaseReturnValue()) {
-                nodes.append(textNode.releaseNonNull());
-                continue;
-            }
-        } else if (std::holds_alternative<String>(variant)) {
-            nodes.append(Text::create(document, WTFMove(std::get<String>(variant))));
-            continue;
-        }
-
-        ASSERT(std::holds_alternative<RefPtr<Node>>(variant));
-        RefPtr node = WTFMove(std::get<RefPtr<Node>>(variant));
-        ASSERT(node);
-        nodes.append(node.releaseNonNull());
-    }
+    auto nodes = WTF::map(WTFMove(nodeOrStringVector), [&](auto&& variant) -> Ref<Node> {
+        return WTF::switchOn(WTFMove(variant),
+            [&](RefPtr<Node>&& node) { return node.releaseNonNull(); },
+            [&](String&& string) -> Ref<Node> { return Text::create(document, WTFMove(string)); }
+        );
+    });
 
     if (nodes.size() == 1)
         return RefPtr<Node> { WTFMove(nodes.first()) };
@@ -642,26 +623,16 @@ ExceptionOr<RefPtr<Node>> Node::convertNodesOrStringsOrTrustedScriptsIntoNode(Re
 }
 
 // https://dom.spec.whatwg.org/#converting-nodes-into-a-node except this returns a NodeVector
-ExceptionOr<NodeVector> Node::convertNodesOrStringsOrTrustedScriptsIntoNodeVector(RefPtr<Node> parent, FixedVector<NodeOrStringOrTrustedScript>&& vector)
+ExceptionOr<NodeVector> Node::convertNodesOrStringsIntoNodeVector(FixedVector<NodeOrString>&& nodeOrStringVector)
 {
-    if (vector.isEmpty())
+    if (nodeOrStringVector.isEmpty())
         return NodeVector { };
 
     Ref document = this->document();
     NodeVector nodeVector;
-    nodeVector.reserveInitialCapacity(vector.size());
-    auto trustedTypesEnabled = document->scriptExecutionContext()->settingsValues().trustedTypesEnabled;
-    for (auto& variant : vector) {
-        if (trustedTypesEnabled) {
-            auto textNodeHolder = processNodeOrStringAsTrustedType(document, parent, variant);
-            if (textNodeHolder.hasException())
-                return textNodeHolder.releaseException();
-
-            if (RefPtr textNode = textNodeHolder.releaseReturnValue()) {
-                nodeVector.append(textNode.releaseNonNull());
-                continue;
-            }
-        } else if (std::holds_alternative<String>(variant)) {
+    nodeVector.reserveInitialCapacity(nodeOrStringVector.size());
+    for (auto& variant : nodeOrStringVector) {
+        if (std::holds_alternative<String>(variant)) {
             nodeVector.append(Text::create(document, WTFMove(std::get<String>(variant))));
             continue;
         }
@@ -688,16 +659,16 @@ ExceptionOr<NodeVector> Node::convertNodesOrStringsOrTrustedScriptsIntoNodeVecto
     return nodeVector;
 }
 
-ExceptionOr<void> Node::before(FixedVector<NodeOrStringOrTrustedScript>&& vector)
+ExceptionOr<void> Node::before(FixedVector<NodeOrString>&& nodeOrStringVector)
 {
     RefPtr parent = parentNode();
     if (!parent)
         return { };
 
-    auto nodeSet = nodeSetPreTransformedFromNodeOrStringOrTrustedScriptVector(vector);
+    auto nodeSet = nodeSetPreTransformedFromNodeOrStringVector(nodeOrStringVector);
     RefPtr viablePreviousSibling = firstPrecedingSiblingNotInNodeSet(*this, nodeSet);
 
-    auto result = convertNodesOrStringsOrTrustedScriptsIntoNodeVector(parent, WTFMove(vector));
+    auto result = convertNodesOrStringsIntoNodeVector(WTFMove(nodeOrStringVector));
     if (result.hasException())
         return result.releaseException();
 
@@ -709,16 +680,16 @@ ExceptionOr<void> Node::before(FixedVector<NodeOrStringOrTrustedScript>&& vector
     return parent->insertChildrenBeforeWithoutPreInsertionValidityCheck(WTFMove(newChildren), viableNextSibling.get());
 }
 
-ExceptionOr<void> Node::after(FixedVector<NodeOrStringOrTrustedScript>&& vector)
+ExceptionOr<void> Node::after(FixedVector<NodeOrString>&& nodeOrStringVector)
 {
     RefPtr parent = parentNode();
     if (!parent)
         return { };
 
-    auto nodeSet = nodeSetPreTransformedFromNodeOrStringOrTrustedScriptVector(vector);
+    auto nodeSet = nodeSetPreTransformedFromNodeOrStringVector(nodeOrStringVector);
     RefPtr viableNextSibling = firstFollowingSiblingNotInNodeSet(*this, nodeSet);
 
-    auto result = convertNodesOrStringsOrTrustedScriptsIntoNodeVector(parent, WTFMove(vector));
+    auto result = convertNodesOrStringsIntoNodeVector(WTFMove(nodeOrStringVector));
     if (result.hasException())
         return result.releaseException();
 
@@ -729,16 +700,16 @@ ExceptionOr<void> Node::after(FixedVector<NodeOrStringOrTrustedScript>&& vector)
     return parent->insertChildrenBeforeWithoutPreInsertionValidityCheck(WTFMove(newChildren), viableNextSibling.get());
 }
 
-ExceptionOr<void> Node::replaceWith(FixedVector<NodeOrStringOrTrustedScript>&& vector)
+ExceptionOr<void> Node::replaceWith(FixedVector<NodeOrString>&& nodeOrStringVector)
 {
     RefPtr parent = parentNode();
     if (!parent)
         return { };
 
-    auto nodeSet = nodeSetPreTransformedFromNodeOrStringOrTrustedScriptVector(vector);
+    auto nodeSet = nodeSetPreTransformedFromNodeOrStringVector(nodeOrStringVector);
     RefPtr viableNextSibling = firstFollowingSiblingNotInNodeSet(*this, nodeSet);
 
-    auto result = convertNodesOrStringsOrTrustedScriptsIntoNode(parent, WTFMove(vector));
+    auto result = convertNodesOrStringsIntoNode(WTFMove(nodeOrStringVector));
     if (result.hasException())
         return result.releaseException();
 
diff --git a/Source/WebCore/dom/Node.h b/Source/WebCore/dom/Node.h
index d9066bb149209..f9d80b73939ea 100644
--- a/Source/WebCore/dom/Node.h
+++ b/Source/WebCore/dom/Node.h
@@ -72,7 +72,6 @@ class RenderStyle;
 class SVGQualifiedName;
 class ShadowRoot;
 class TouchEvent;
-class TrustedScript;
 class WebCoreOpaqueRoot;
 
 namespace Style {
@@ -91,7 +90,7 @@ enum class MutationObserverOptionType : uint8_t;
 using MutationObserverOptions = OptionSet<MutationObserverOptionType>;
 using MutationRecordDeliveryOptions = OptionSet<MutationObserverOptionType>;
 
-using NodeOrStringOrTrustedScript = std::variant<RefPtr<Node>, String, RefPtr<TrustedScript>>;
+using NodeOrString = std::variant<RefPtr<Node>, String>;
 
 const int initialNodeVectorSize = 11; // Covers 99.5%. See webkit.org/b/80706
 typedef Vector<Ref<Node>, initialNodeVectorSize> NodeVector;
@@ -218,9 +217,9 @@ class Node : public EventTarget {
     WEBCORE_EXPORT Element* nextElementSibling() const;
 
     // From the ChildNode - https://dom.spec.whatwg.org/#childnode
-    ExceptionOr<void> before(FixedVector<NodeOrStringOrTrustedScript>&&);
-    ExceptionOr<void> after(FixedVector<NodeOrStringOrTrustedScript>&&);
-    ExceptionOr<void> replaceWith(FixedVector<NodeOrStringOrTrustedScript>&&);
+    ExceptionOr<void> before(FixedVector<NodeOrString>&&);
+    ExceptionOr<void> after(FixedVector<NodeOrString>&&);
+    ExceptionOr<void> replaceWith(FixedVector<NodeOrString>&&);
     WEBCORE_EXPORT ExceptionOr<void> remove();
 
     // Other methods (not part of DOM)
@@ -767,9 +766,9 @@ class Node : public EventTarget {
     template<typename NodeClass>
     static NodeClass& traverseToRootNodeInternal(const NodeClass&);
 
-    // FIXME: Replace all uses of convertNodesOrStringsOrTrustedScriptsIntoNode by convertNodesOrStringsOrTrustedScriptsIntoNodeVector.
-    ExceptionOr<RefPtr<Node>> convertNodesOrStringsOrTrustedScriptsIntoNode(RefPtr<Node>, FixedVector<NodeOrStringOrTrustedScript>&&);
-    ExceptionOr<NodeVector> convertNodesOrStringsOrTrustedScriptsIntoNodeVector(RefPtr<Node>, FixedVector<NodeOrStringOrTrustedScript>&&);
+    // FIXME: Replace all uses of convertNodesOrStringsIntoNode by convertNodesOrStringsIntoNodeVector.
+    ExceptionOr<RefPtr<Node>> convertNodesOrStringsIntoNode(FixedVector<NodeOrString>&&);
+    ExceptionOr<NodeVector> convertNodesOrStringsIntoNodeVector(FixedVector<NodeOrString>&&);
 
 private:
     virtual PseudoId customPseudoId() const
diff --git a/Source/WebCore/dom/ParentNode.idl b/Source/WebCore/dom/ParentNode.idl
index 9c9edfaf0b927..bfeee3fe091cc 100644
--- a/Source/WebCore/dom/ParentNode.idl
+++ b/Source/WebCore/dom/ParentNode.idl
@@ -31,9 +31,9 @@ interface mixin ParentNode {
     readonly attribute Element? lastElementChild;
     readonly attribute unsigned long childElementCount;
 
-    [CEReactions=Needed, Unscopable] undefined prepend((Node or DOMString or TrustedScript)... nodes);
-    [CEReactions=Needed, Unscopable] undefined append((Node or DOMString or TrustedScript)... nodes);
-    [CEReactions=Needed, Unscopable] undefined replaceChildren((Node or DOMString or TrustedScript)... nodes);
+    [CEReactions=Needed, Unscopable] undefined prepend((Node or DOMString)... nodes);
+    [CEReactions=Needed, Unscopable] undefined append((Node or DOMString)... nodes);
+    [CEReactions=Needed, Unscopable] undefined replaceChildren((Node or DOMString)... nodes);
 
     Element? querySelector(DOMString selectors);
     [NewObject] NodeList querySelectorAll(DOMString selectors);
diff --git a/Source/WebCore/dom/TrustedType.cpp b/Source/WebCore/dom/TrustedType.cpp
index 37c95fa097eb3..6c3f9a2f09fff 100644
--- a/Source/WebCore/dom/TrustedType.cpp
+++ b/Source/WebCore/dom/TrustedType.cpp
@@ -28,13 +28,11 @@
 
 #include "ContentSecurityPolicy.h"
 #include "Document.h"
-#include "HTMLScriptElement.h"
+#include "HTMLElement.h"
 #include "JSDOMExceptionHandling.h"
 #include "JSTrustedScript.h"
 #include "LocalDOMWindow.h"
-#include "Node.h"
 #include "SVGNames.h"
-#include "Text.h"
 #include "TrustedTypePolicy.h"
 #include "TrustedTypePolicyFactory.h"
 #include "WindowOrWorkerGlobalScopeTrustedTypes.h"
@@ -304,30 +302,6 @@ ExceptionOr<String> requireTrustedTypesForPreNavigationCheckPasses(ScriptExecuti
         : nullString());
 }
 
-ExceptionOr<RefPtr<Text>> processNodeOrStringAsTrustedType(Ref<Document> document, RefPtr<Node> parent, std::variant<RefPtr<Node>, String, RefPtr<TrustedScript>> variant)
-{
-    RefPtr<Text> text;
-    if (std::holds_alternative<String>(variant))
-        text = Text::create(document, WTFMove(std::get<String>(variant)));
-    else if (std::holds_alternative<RefPtr<Node>>(variant)) {
-        if (RefPtr textNode = dynamicDowncast<Text>(std::get<RefPtr<Node>>(variant)))
-            text = textNode;
-    }
-
-    if (text) {
-        if (UNLIKELY(is<HTMLScriptElement>(parent))) {
-            auto holder = trustedTypeCompliantString(TrustedType::TrustedScript, *document->scriptExecutionContext(), text->wholeText(), "HTMLScriptElement text"_s);
-            if (holder.hasException())
-                return holder.releaseException();
-
-            text->replaceWholeText(holder.releaseReturnValue());
-        }
-    } else if (std::holds_alternative<RefPtr<TrustedScript>>(variant))
-        text = Text::create(document, std::get<RefPtr<TrustedScript>>(variant)->toString());
-
-    return text;
-}
-
 ExceptionOr<bool> canCompile(ScriptExecutionContext& scriptExecutionContext, JSC::CompilationType compilationType, String codeString, JSC::JSValue bodyArgument)
 {
     VM& vm = scriptExecutionContext.vm();
diff --git a/Source/WebCore/dom/TrustedType.h b/Source/WebCore/dom/TrustedType.h
index 3e89fe3508909..cef9bec7b0609 100644
--- a/Source/WebCore/dom/TrustedType.h
+++ b/Source/WebCore/dom/TrustedType.h
@@ -40,11 +40,8 @@ enum class CompilationType;
 
 namespace WebCore {
 
-class Document;
 class Exception;
-class Node;
 class ScriptExecutionContext;
-class Text;
 
 enum class TrustedType : int8_t {
     TrustedHTML,
@@ -73,8 +70,6 @@ ExceptionOr<String> trustedTypeCompliantString(ScriptExecutionContext&, std::var
 
 ExceptionOr<String> trustedTypeCompliantString(ScriptExecutionContext&, std::variant<RefPtr<TrustedScriptURL>, String>&&, const String& sink);
 
-ExceptionOr<RefPtr<Text>> processNodeOrStringAsTrustedType(Ref<Document>, RefPtr<Node> parent, std::variant<RefPtr<Node>, String, RefPtr<TrustedScript>>);
-
 WEBCORE_EXPORT AttributeTypeAndSink trustedTypeForAttribute(const String& elementName, const String& attributeName, const String& elementNamespace, const String& attributeNamespace);
 
 ExceptionOr<bool> canCompile(ScriptExecutionContext&, JSC::CompilationType, String codeString, JSC::JSValue bodyArgument);