Add formForBindings() and controlForBindings() methods.

Alice Boxhall · rniwa · commit 11632dcce8d1 · 2025-02-12T22:04:42.000-08:00
https://bugs.webkit.org/show_bug.cgi?id=287536 Reviewed by Ryosuke Niwa. These methods currently delegate directly to form() and control() respectively, but will later be modified to ensure that nodes don't leak out of shadow roots once referenceTarget is supported. * Source/WebCore/html/FormAssociatedElement.cpp: (WebCore::FormAssociatedElement::formForBindings const): * Source/WebCore/html/FormAssociatedElement.h: * Source/WebCore/html/HTMLButtonElement.idl: * Source/WebCore/html/HTMLFieldSetElement.idl: * Source/WebCore/html/HTMLInputElement.idl: * Source/WebCore/html/HTMLLabelElement.cpp: (WebCore::HTMLLabelElement::controlForBindings const): (WebCore::HTMLLabelElement::formForBindings const): * Source/WebCore/html/HTMLLabelElement.h: * Source/WebCore/html/HTMLLabelElement.idl: * Source/WebCore/html/HTMLLegendElement.cpp: (WebCore::HTMLLegendElement::formForBindings const): * Source/WebCore/html/HTMLLegendElement.h: * Source/WebCore/html/HTMLLegendElement.idl: * Source/WebCore/html/HTMLObjectElement.idl: * Source/WebCore/html/HTMLOptionElement.cpp: (WebCore::HTMLOptionElement::formForBindings const): * Source/WebCore/html/HTMLOptionElement.h: * Source/WebCore/html/HTMLOptionElement.idl: * Source/WebCore/html/HTMLOutputElement.idl: * Source/WebCore/html/HTMLSelectElement.idl: * Source/WebCore/html/HTMLTextAreaElement.idl: Canonical link: https://commits.webkit.org/290323@main
diff --git a/Source/WebCore/html/FormAssociatedElement.cpp b/Source/WebCore/html/FormAssociatedElement.cpp
@@ -35,6 +35,11 @@ FormAssociatedElement::FormAssociatedElement(HTMLFormElement* form)
 {
 }
 
+HTMLFormElement* FormAssociatedElement::formForBindings() const
+{
+    return form();
+}
+
 void FormAssociatedElement::setFormInternal(RefPtr<HTMLFormElement>&& newForm)
 {
     ASSERT(m_form.get() != newForm);
diff --git a/Source/WebCore/html/FormAssociatedElement.h b/Source/WebCore/html/FormAssociatedElement.h
@@ -38,6 +38,7 @@ class FormAssociatedElement {
     virtual void formWillBeDestroyed() { m_form = nullptr; }
 
     HTMLFormElement* form() const { return m_form.get(); }
+    virtual HTMLFormElement* formForBindings() const;
 
     void setForm(RefPtr<HTMLFormElement>&&);
     virtual void elementInsertedIntoAncestor(Element&, Node::InsertionType);
diff --git a/Source/WebCore/html/HTMLButtonElement.idl b/Source/WebCore/html/HTMLButtonElement.idl
@@ -22,7 +22,7 @@
     Exposed=Window
 ] interface HTMLButtonElement : HTMLElement {
     [CEReactions=NotNeeded, Reflect] attribute boolean disabled;
-    readonly attribute HTMLFormElement form;
+    [ImplementedAs=formForBindings] readonly attribute HTMLFormElement form;
     [CEReactions=NotNeeded] attribute [AtomString] USVString formAction;
 
     [CEReactions=NotNeeded] attribute [AtomString] DOMString formEnctype;
diff --git a/Source/WebCore/html/HTMLFieldSetElement.idl b/Source/WebCore/html/HTMLFieldSetElement.idl
@@ -21,7 +21,7 @@
     Exposed=Window
 ] interface HTMLFieldSetElement : HTMLElement {
     [CEReactions=Needed, Reflect] attribute boolean disabled;
-    readonly attribute HTMLFormElement form;
+    [ImplementedAs=formForBindings] readonly attribute HTMLFormElement form;
     [CEReactions=NotNeeded, Reflect] attribute DOMString name;
 
     readonly attribute DOMString type;
diff --git a/Source/WebCore/html/HTMLInputElement.idl b/Source/WebCore/html/HTMLInputElement.idl
@@ -48,7 +48,7 @@ enum AutofillButtonType {
     [EnabledBySetting=InputTypeColorEnhancementsEnabled, CEReactions=NotNeeded] attribute [AtomString] DOMString colorSpace;
     [CEReactions=NotNeeded, Reflect] attribute DOMString dirName;
     [CEReactions=NotNeeded, Reflect] attribute boolean disabled;
-    readonly attribute HTMLFormElement form;
+    [ImplementedAs=formForBindings] readonly attribute HTMLFormElement form;
     [ImplementedAs=filesForBindings] attribute FileList? files;
     [CEReactions=NotNeeded] attribute [AtomString] USVString formAction;
 
diff --git a/Source/WebCore/html/HTMLLabelElement.cpp b/Source/WebCore/html/HTMLLabelElement.cpp
@@ -87,6 +87,11 @@ RefPtr<HTMLElement> HTMLLabelElement::control() const
     return isConnected() ? firstElementWithIdIfLabelable(treeScope(), controlId) : nullptr;
 }
 
+RefPtr<HTMLElement> HTMLLabelElement::controlForBindings() const
+{
+    return control();
+}
+
 HTMLFormElement* HTMLLabelElement::form() const
 {
     if (auto element = control()) {
@@ -96,6 +101,11 @@ HTMLFormElement* HTMLLabelElement::form() const
     return nullptr;
 }
 
+HTMLFormElement* HTMLLabelElement::formForBindings() const
+{
+    return form();
+}
+
 void HTMLLabelElement::setActive(bool down, Style::InvalidationScope invalidationScope)
 {
     // Update our status first.
diff --git a/Source/WebCore/html/HTMLLabelElement.h b/Source/WebCore/html/HTMLLabelElement.h
@@ -36,7 +36,9 @@ class HTMLLabelElement final : public HTMLElement {
     static Ref<HTMLLabelElement> create(Document&);
 
     WEBCORE_EXPORT RefPtr<HTMLElement> control() const;
+    WEBCORE_EXPORT RefPtr<HTMLElement> controlForBindings() const;
     WEBCORE_EXPORT HTMLFormElement* form() const;
+    WEBCORE_EXPORT HTMLFormElement* formForBindings() const;
 
     bool willRespondToMouseClickEventsWithEditability(Editability) const final;
     void updateLabel(TreeScope&, const AtomString& oldForAttributeValue, const AtomString& newForAttributeValue);
diff --git a/Source/WebCore/html/HTMLLabelElement.idl b/Source/WebCore/html/HTMLLabelElement.idl
@@ -21,8 +21,8 @@
 [
     Exposed=Window
 ] interface HTMLLabelElement : HTMLElement {
-    readonly attribute HTMLFormElement form;
+    [ImplementedAs=formForBindings] readonly attribute HTMLFormElement form;
     [CEReactions=NotNeeded, Reflect=for] attribute DOMString htmlFor;
-    readonly attribute HTMLElement control;
+    [ImplementedAs=controlForBindings] readonly attribute HTMLElement control;
 };
 
diff --git a/Source/WebCore/html/HTMLLegendElement.cpp b/Source/WebCore/html/HTMLLegendElement.cpp
@@ -55,5 +55,10 @@ HTMLFormElement* HTMLLegendElement::form() const
     RefPtr fieldset = dynamicDowncast<HTMLFieldSetElement>(parentNode());
     return fieldset ? fieldset->form() : nullptr;
 }
+
+HTMLFormElement* HTMLLegendElement::formForBindings() const
+{
+    return form();
+}
     
 } // namespace
diff --git a/Source/WebCore/html/HTMLLegendElement.h b/Source/WebCore/html/HTMLLegendElement.h
@@ -35,6 +35,7 @@ class HTMLLegendElement final : public HTMLElement {
     static Ref<HTMLLegendElement> create(const QualifiedName&, Document&);
 
     WEBCORE_EXPORT HTMLFormElement* form() const;
+    WEBCORE_EXPORT HTMLFormElement* formForBindings() const;
 
 private:
     HTMLLegendElement(const QualifiedName&, Document&);
diff --git a/Source/WebCore/html/HTMLLegendElement.idl b/Source/WebCore/html/HTMLLegendElement.idl
@@ -21,7 +21,7 @@
 [
     Exposed=Window
 ] interface HTMLLegendElement : HTMLElement {
-    readonly attribute HTMLFormElement form;
+    [ImplementedAs=formForBindings] readonly attribute HTMLFormElement form;
     [CEReactions=NotNeeded, Reflect] attribute DOMString align;
 };
 
diff --git a/Source/WebCore/html/HTMLObjectElement.idl b/Source/WebCore/html/HTMLObjectElement.idl
@@ -22,7 +22,7 @@
     Plugin,
     Exposed=Window
 ] interface HTMLObjectElement : HTMLElement {
-    readonly attribute HTMLFormElement form;
+    [ImplementedAs=formForBindings] readonly attribute HTMLFormElement form;
     [CEReactions=NotNeeded, Reflect] attribute DOMString code;
     [CEReactions=NotNeeded, Reflect] attribute DOMString align;
     [CEReactions=NotNeeded, Reflect] attribute DOMString archive;
diff --git a/Source/WebCore/html/HTMLOptionElement.cpp b/Source/WebCore/html/HTMLOptionElement.cpp
@@ -145,6 +145,11 @@ HTMLFormElement* HTMLOptionElement::form() const
     return nullptr;
 }
 
+HTMLFormElement* HTMLOptionElement::formForBindings() const
+{
+    return form();
+}
+
 int HTMLOptionElement::index() const
 {
     // It would be faster to cache the index, but harder to get it right in all cases.
diff --git a/Source/WebCore/html/HTMLOptionElement.h b/Source/WebCore/html/HTMLOptionElement.h
@@ -44,6 +44,7 @@ class HTMLOptionElement final : public HTMLElement {
     void setText(String&&);
 
     WEBCORE_EXPORT HTMLFormElement* form() const;
+    WEBCORE_EXPORT HTMLFormElement* formForBindings() const;
 
     WEBCORE_EXPORT int index() const;
 
diff --git a/Source/WebCore/html/HTMLOptionElement.idl b/Source/WebCore/html/HTMLOptionElement.idl
@@ -25,7 +25,7 @@
     LegacyFactoryFunction=Option(optional DOMString text = "", optional [AtomString] DOMString value, optional boolean defaultSelected = false, optional boolean selected = false),
 ] interface HTMLOptionElement : HTMLElement {
     [CEReactions=NotNeeded, Reflect] attribute boolean disabled;
-    readonly attribute HTMLFormElement form;
+    [ImplementedAs=formForBindings] readonly attribute HTMLFormElement form;
     [CEReactions=NotNeeded] attribute [AtomString] DOMString label;
     [CEReactions=NotNeeded, Reflect=selected] attribute boolean defaultSelected;
     attribute boolean selected;
diff --git a/Source/WebCore/html/HTMLOutputElement.idl b/Source/WebCore/html/HTMLOutputElement.idl
@@ -29,7 +29,7 @@
     [CallWith=CurrentDocument, HTMLConstructor] constructor();
 
     [SameObject, PutForwards=value] readonly attribute DOMTokenList htmlFor;
-    readonly attribute HTMLFormElement? form;
+    [ImplementedAs=formForBindings] readonly attribute HTMLFormElement? form;
     [CEReactions=NotNeeded, Reflect] attribute DOMString name;
 
     readonly attribute DOMString type;
diff --git a/Source/WebCore/html/HTMLSelectElement.idl b/Source/WebCore/html/HTMLSelectElement.idl
@@ -25,7 +25,7 @@
 ] interface HTMLSelectElement : HTMLElement {
     [CEReactions=NotNeeded] attribute [AtomString] DOMString autocomplete;
     [CEReactions=NotNeeded, Reflect] attribute boolean disabled;
-    readonly attribute HTMLFormElement? form;
+    [ImplementedAs=formForBindings] readonly attribute HTMLFormElement? form;
     [CEReactions=NotNeeded, Reflect] attribute boolean multiple;
     [CEReactions=NotNeeded, Reflect] attribute DOMString name;
     [CEReactions=NotNeeded, Reflect] attribute boolean required;
diff --git a/Source/WebCore/html/HTMLTextAreaElement.idl b/Source/WebCore/html/HTMLTextAreaElement.idl
@@ -26,7 +26,7 @@
 ] interface HTMLTextAreaElement : HTMLElement {
     [CEReactions=NotNeeded, Reflect] attribute DOMString dirName;
     [CEReactions=NotNeeded, Reflect] attribute boolean disabled;
-    readonly attribute HTMLFormElement form;
+    [ImplementedAs=formForBindings] readonly attribute HTMLFormElement form;
     [CEReactions=NotNeeded] attribute long minLength;
     [CEReactions=NotNeeded] attribute long maxLength;
     [CEReactions=NotNeeded, Reflect] attribute DOMString name;

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,11 @@ FormAssociatedElement::FormAssociatedElement(HTMLFormElement* form)`
`35`	`35`	`{`
`36`	`36`	`}`
`37`	`37`
	`38`	`+HTMLFormElement* FormAssociatedElement::formForBindings() const`
	`39`	`+{`
	`40`	`+ return form();`
	`41`	`+}`
	`42`	`+`
`38`	`43`	`void FormAssociatedElement::setFormInternal(RefPtr<HTMLFormElement>&& newForm)`
`39`	`44`	`{`
`40`	`45`	`ASSERT(m_form.get() != newForm);`
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,11 @@ RefPtr<HTMLElement> HTMLLabelElement::control() const`
`87`	`87`	`return isConnected() ? firstElementWithIdIfLabelable(treeScope(), controlId) : nullptr;`
`88`	`88`	`}`
`89`	`89`
	`90`	`+RefPtr<HTMLElement> HTMLLabelElement::controlForBindings() const`
	`91`	`+{`
	`92`	`+ return control();`
	`93`	`+}`
	`94`	`+`
`90`	`95`	`HTMLFormElement* HTMLLabelElement::form() const`
`91`	`96`	`{`
`92`	`97`	`if (auto element = control()) {`
`@@ -96,6 +101,11 @@ HTMLFormElement* HTMLLabelElement::form() const`
`96`	`101`	`return nullptr;`
`97`	`102`	`}`
`98`	`103`
	`104`	`+HTMLFormElement* HTMLLabelElement::formForBindings() const`
	`105`	`+{`
	`106`	`+ return form();`
	`107`	`+}`
	`108`	`+`
`99`	`109`	`void HTMLLabelElement::setActive(bool down, Style::InvalidationScope invalidationScope)`
`100`	`110`	`{`
`101`	`111`	`// Update our status first.`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`[`
`22`	`22`	`Exposed=Window`
`23`	`23`	`] interface HTMLLegendElement : HTMLElement {`
`24`		`- readonly attribute HTMLFormElement form;`
	`24`	`+ [ImplementedAs=formForBindings] readonly attribute HTMLFormElement form;`
`25`	`25`	`[CEReactions=NotNeeded, Reflect] attribute DOMString align;`
`26`	`26`	`};`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,11 @@ HTMLFormElement* HTMLOptionElement::form() const`
`145`	`145`	`return nullptr;`
`146`	`146`	`}`
`147`	`147`
	`148`	`+HTMLFormElement* HTMLOptionElement::formForBindings() const`
	`149`	`+{`
	`150`	`+ return form();`
	`151`	`+}`
	`152`	`+`
`148`	`153`	`int HTMLOptionElement::index() const`
`149`	`154`	`{`
`150`	`155`	`// It would be faster to cache the index, but harder to get it right in all cases.`