Make Attr.nodeValue/textContent not nullable

https://bugs.webkit.org/show_bug.cgi?id=249323 rdar://problem/103602803 Reviewed by Chris Dumez. This patch aligns WebKit with Gecko / Firefox and Blink / Chromium. Inspired: https://chromium.googlesource.com/chromium/blink/+/a7c3bb9f22401c30e906a3ec53595247e707de83 This patch updates Attr value for 'nodeVAlue' and 'textContent' to return empty string if null. Web-Spec: https://dom.spec.whatwg.org/#interface-attr * Source/WebCore/dom/Attr.cpp: (Attr::setNodeValue): As per commit message * LayoutTests/fast/dom/coreDOM-element-attribute-js-null.xhtml: Rebaselined * LayoutTests/fast/dom/coreDOM-element-attribute-js-null-expected.txt: Rebaselined Canonical link: https://commits.webkit.org/265769@main
WebKit · Jul 5, 2023 · 2da4c96 · 2da4c96
1 parent 8e5e36c
commit 2da4c96
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/LayoutTests/fast/dom/coreDOM-element-attribute-js-null-expected.txt b/LayoutTests/fast/dom/coreDOM-element-attribute-js-null-expected.txt
@@ -1,6 +1,8 @@
 This test setting various attributes of a elements to JavaScript null.
 
 TEST SUCCEEDED: The value was the string 'null'. [tested Attr.value]
+TEST SUCCEEDED: The value was the empty string. [tested Attr.nodeValue]
+TEST SUCCEEDED: The value was the empty string. [tested Attr.textContent]
 
 TEST SUCCEEDED: The value was the empty string. [tested ProcessingInstruction.data]
 

diff --git a/LayoutTests/fast/dom/coreDOM-element-attribute-js-null.xhtml b/LayoutTests/fast/dom/coreDOM-element-attribute-js-null.xhtml
@@ -50,7 +50,9 @@
                     type: 'Attr',
                     elementToUse: document.createAttributeNS('http://www.w3.org/1999/xhtml','anAttribute'),
                     attributes: [
-                        {name: 'value', expectedNull: 'null'}
+                        {name: 'value', expectedNull: 'null'},
+                        {name: 'nodeValue', expectedNull: ''},
+                        {name: 'textContent', expectedNull: ''}
                     ]
                 },
                 {

diff --git a/Source/WebCore/dom/Attr.cpp b/Source/WebCore/dom/Attr.cpp
@@ -103,7 +103,7 @@ void Attr::setValue(const AtomString& value)
 
 void Attr::setNodeValue(const String& value)
 {
-    setValue(AtomString { value });
+    setValue(value.isNull() ? emptyAtom() : AtomString(value));
 }
 
 Ref<Node> Attr::cloneNodeInternal(Document& targetDocument, CloningOperation)