Changeset 47767 in webkit

Timestamp:

Aug 25, 2009 5:51:02 PM (15 years ago)

Author:

eric@webkit.org

Message:

2009-08-25 Kent Tamura <​tkent@chromium.org>

Reviewed by Eric Seidel.

Support for HTMLInputElement::list and HTMLInputElement::selectedOption.
​https://bugs.webkit.org/show_bug.cgi?id=27756

Tests: fast/forms/input-list.html

fast/forms/input-selectedoption.html

• html/HTMLAttributeNames.in:
• html/HTMLInputElement.cpp: (WebCore::HTMLInputElement::parseMappedAttribute): (WebCore::HTMLInputElement::list): (WebCore::HTMLInputElement::selectedOption):
• html/HTMLInputElement.h:
• html/HTMLInputElement.idl:

2009-08-25 Kent Tamura <​tkent@chromium.org>

Reviewed by Eric Seidel.

Support for HTMLInputElement::list and HTMLInputElement::selectedOption.
​https://bugs.webkit.org/show_bug.cgi?id=27756

• fast/forms/input-list-expected.txt: Added.
• fast/forms/input-list.html: Added.
• fast/forms/input-selectedoption-expected.txt: Added.
• fast/forms/input-selectedoption.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/input-list-expected.txt (added)
• LayoutTests/fast/forms/input-list.html (added)
• LayoutTests/fast/forms/input-selectedoption-expected.txt (added)
• LayoutTests/fast/forms/input-selectedoption.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTMLAttributeNames.in (modified) (1 diff)
• WebCore/html/HTMLInputElement.cpp (modified) (3 diffs)
• WebCore/html/HTMLInputElement.h (modified) (3 diffs)
• WebCore/html/HTMLInputElement.idl (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-08-25  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Support for HTMLInputElement::list and HTMLInputElement::selectedOption.
+        https://bugs.webkit.org/show_bug.cgi?id=27756
+
+        * fast/forms/input-list-expected.txt: Added.
+        * fast/forms/input-list.html: Added.
+        * fast/forms/input-selectedoption-expected.txt: Added.
+        * fast/forms/input-selectedoption.html: Added.
+
 2009-08-25  Eric Carlson  <eric.carlson@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-08-25  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Support for HTMLInputElement::list and HTMLInputElement::selectedOption.
+        https://bugs.webkit.org/show_bug.cgi?id=27756
+
+        Tests: fast/forms/input-list.html
+               fast/forms/input-selectedoption.html
+
+        * html/HTMLAttributeNames.in:
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::parseMappedAttribute):
+        (WebCore::HTMLInputElement::list):
+        (WebCore::HTMLInputElement::selectedOption):
+        * html/HTMLInputElement.h:
+        * html/HTMLInputElement.idl:
+
 2009-08-25  Eric Carlson  <eric.carlson@apple.com>
 

trunk/WebCore/html/HTMLAttributeNames.in

@@ -99 +99 @@
 leftmargin
 link
+list
 longdesc
 loop

trunk/WebCore/html/HTMLInputElement.cpp

@@ -40 +40 @@
 #include "FormDataList.h"
 #include "Frame.h"
+#include "HTMLDataListElement.h"
 #include "HTMLFormElement.h"
 #include "HTMLImageLoader.h"
 #include "HTMLNames.h"
+#include "HTMLOptionElement.h"
 #include "ScriptEventListener.h"
 #include "KeyboardEvent.h"
@@ -736 +738 @@
              attr->name() == precisionAttr)
         setNeedsStyleRecalc();
+#if ENABLE(DATALIST)
+    else if (attr->name() == listAttr)
+        m_hasNonEmptyList = !attr->isEmpty();
+        // FIXME: we need to tell this change to a renderer if the attribute affects the appearance.
+#endif
     else
         HTMLFormControlElementWithState::parseMappedAttribute(attr);
@@ -1766 +1773 @@
 }
 
+#if ENABLE(DATALIST)
+HTMLDataListElement* HTMLInputElement::list()
+{
+    if (!m_hasNonEmptyList)
+        return 0;
+
+    switch (inputType()) {
+    case TEXT:
+    case SEARCH:
+    case URL:
+    case TELEPHONE:
+    case EMAIL:
+    case NUMBER:
+    case RANGE: {
+        Element* element = document()->getElementById(getAttribute(listAttr));
+        if (element && element->hasTagName(datalistTag))
+            return static_cast<HTMLDataListElement*>(element);
+        break;
+    }
+    case HIDDEN:
+    case PASSWORD:
+    case CHECKBOX:
+    case RADIO:
+    case FILE:
+    case SUBMIT:
+    case IMAGE:
+    case RESET:
+    case BUTTON:
+    case ISINDEX:
+        break;
+    }
+    return 0;
+}
+
+HTMLOptionElement* HTMLInputElement::selectedOption()
+{
+    String currentValue = value();
+    // The empty value never matches to a datalist option because it
+    // doesn't represent a suggestion according to the standard.
+    if (currentValue.isEmpty())
+        return 0;
+
+    HTMLDataListElement* sourceElement = list();
+    if (!sourceElement)
+        return 0;
+    RefPtr<HTMLCollection> options = sourceElement->options();
+    for (unsigned i = 0; options && i < options->length(); ++i) {
+        HTMLOptionElement* option = static_cast<HTMLOptionElement*>(options->item(i));
+        if (!option->disabled() && currentValue == option->value())
+            return option;
+    }
+    return 0;
+}
+#endif  // ENABLE(DATALIST)
+
 } // namespace

trunk/WebCore/html/HTMLInputElement.h

@@ -32 +32 @@
 
 class FileList;
+class HTMLDataListElement;
 class HTMLImageLoader;
+class HTMLOptionElement;
 class KURL;
 class VisibleSelection;
@@ -195 +197 @@
     void setSrc(const String&);
 
+#if ENABLE(DATALIST)
+    HTMLDataListElement* list();
+    HTMLOptionElement* selectedOption();
+#endif
+
     int maxLength() const;
     void setMaxLength(int);
@@ -260 +267 @@
     bool m_autofilled : 1;
     bool m_inited : 1;
+#if ENABLE(DATALIST)
+    bool m_hasNonEmptyList : 1;
+#endif
 };
 

trunk/WebCore/html/HTMLInputElement.idl

@@ -40 +40 @@
                  attribute boolean         disabled;
                  attribute boolean         autofocus;
+#if defined(ENABLE_DATALIST) && ENABLE_DATALIST
+                 // The type of the list is HTMLElement according to the standard.
+                 // We intentionally use HTMLDataListElement for it because our implementation
+                 // always returns an HTMLDataListElement instance.
+        readonly attribute HTMLDataListElement list;
+#endif
                  attribute long            maxLength;
                  attribute boolean         multiple;
@@ -57 +63 @@
                  attribute [ConvertNullToNullString] DOMString useMap;
                  attribute [ConvertNullToNullString] DOMString value;
+#if defined(ENABLE_DATALIST) && ENABLE_DATALIST
+        readonly attribute HTMLOptionElement selectedOption;
+#endif
         readonly attribute boolean         willValidate;
         boolean            checkValidity();