Changeset 204064 in webkit

Timestamp:

Aug 2, 2016 7:56:22 PM (8 years ago)

Author:

Chris Dumez

Message:

Drop custom bindings code for HTMLSelectElement.remove()
​https://bugs.webkit.org/show_bug.cgi?id=160477

Reviewed by Darin Adler.

Drop custom bindings code for HTMLSelectElement.remove() and use
overloading instead.

• bindings/js/JSHTMLSelectElementCustom.cpp:

(WebCore::JSHTMLSelectElement::remove): Deleted.

• html/HTMLSelectElement.idl:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSHTMLSelectElementCustom.cpp (modified) (1 diff)
• html/HTMLSelectElement.idl (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-08-02  Chris Dumez  <cdumez@apple.com>
+
+        Drop custom bindings code for HTMLSelectElement.remove()
+        https://bugs.webkit.org/show_bug.cgi?id=160477
+
+        Reviewed by Darin Adler.
+
+        Drop custom bindings code for HTMLSelectElement.remove() and use
+        overloading instead.
+
+        * bindings/js/JSHTMLSelectElementCustom.cpp:
+        (WebCore::JSHTMLSelectElement::remove): Deleted.
+        * html/HTMLSelectElement.idl:
+
 2016-08-02  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/bindings/js/JSHTMLSelectElementCustom.cpp

@@ -33 +33 @@
 using namespace HTMLNames;
 
-JSValue JSHTMLSelectElement::remove(ExecState& state)
-{
-    HTMLSelectElement& select = wrapped();
-
-    if (!state.argumentCount()) {
-        // When called with no argument, we should call Element::remove() to detach.
-        ExceptionCode ec = 0;
-        select.remove(ec);
-        setDOMException(&state, ec);
-    } else {
-        // The HTMLSelectElement::remove() function can take either an option object or the index of an option.
-        if (HTMLOptionElement* option = JSHTMLOptionElement::toWrapped(state.argument(0)))
-            select.remove(*option);
-        else
-            select.removeByIndex(state.argument(0).toInt32(&state));
-    }
-
-    return jsUndefined();
-}
-
 void selectIndexSetter(HTMLSelectElement* select, JSC::ExecState* exec, unsigned index, JSC::JSValue value)
 {

trunk/Source/WebCore/html/HTMLSelectElement.idl

@@ -61 +61 @@
     [RaisesException] void add(HTMLElement element);
 
-    // In JavaScript, we support both option index and option object parameters.
-    // As of this writing this cannot be auto-generated.
-    [Custom] void remove(/* indexOrOption */);
-#else
+    [RaisesException] void remove(); // ChildNode overload
+    // FIXME: This overload is not in the specification and was dropped in Blink.
+    void remove(HTMLOptionElement option);
+#endif
     [ImplementedAs=removeByIndex] void remove(long index);
-#endif
+
 
     readonly attribute HTMLCollection selectedOptions;