Changeset 110340 in webkit

Timestamp:

Mar 9, 2012, 3:11:47 PM (15 years ago)

Author:

alexis.menard@openbossa.org

Message:

Implement selectedOptions attribute of <select>.
​https://bugs.webkit.org/show_bug.cgi?id=80631

Reviewed by Benjamin Poulain.

Source/WebCore:

Add a new collection as a member of HTMLSelectElement which is
used to store the selected elements. Extend HTMLCollection to
support the new collection type needed by this feature.

Reference : ​http://www.whatwg.org/specs/web-apps/current-work/multipage/the-button-element.html#dom-select-selectedoptions

Test: fast/dom/select-selectedOptions.html

• html/CollectionType.h:
• html/HTMLCollection.cpp:

(WebCore::HTMLCollection::shouldIncludeChildren):
(WebCore::HTMLCollection::isAcceptableElement):

• html/HTMLSelectElement.cpp:

(WebCore::HTMLSelectElement::selectedOptions):
(WebCore):

• html/HTMLSelectElement.h:

(HTMLSelectElement):

• html/HTMLSelectElement.idl:

LayoutTests:

New tests to cover the feature.

• fast/dom/select-selectedOptions-expected.txt: Added.
• fast/dom/select-selectedOptions.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/select-selectedOptions-expected.txt (added)
• LayoutTests/fast/dom/select-selectedOptions.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/CollectionType.h (modified) (1 diff)
• Source/WebCore/html/HTMLCollection.cpp (modified) (2 diffs)
• Source/WebCore/html/HTMLSelectElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLSelectElement.h (modified) (2 diffs)
• Source/WebCore/html/HTMLSelectElement.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-09  Alexis Menard  <alexis.menard@openbossa.org>
+
+        Implement selectedOptions attribute of <select>.
+        https://bugs.webkit.org/show_bug.cgi?id=80631
+
+        Reviewed by Benjamin Poulain.
+
+        New tests to cover the feature.
+
+        * fast/dom/select-selectedOptions-expected.txt: Added.
+        * fast/dom/select-selectedOptions.html: Added.
+
 2012-03-09  Ken Buchanan  <kenrb@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-09  Alexis Menard  <alexis.menard@openbossa.org>
+
+        Implement selectedOptions attribute of <select>.
+        https://bugs.webkit.org/show_bug.cgi?id=80631
+
+        Reviewed by Benjamin Poulain.
+
+        Add a new collection as a member of HTMLSelectElement which is
+        used to store the selected elements. Extend HTMLCollection to
+        support the new collection type needed by this feature.
+
+        Reference : http://www.whatwg.org/specs/web-apps/current-work/multipage/the-button-element.html#dom-select-selectedoptions
+
+        Test: fast/dom/select-selectedOptions.html
+
+        * html/CollectionType.h:
+        * html/HTMLCollection.cpp:
+        (WebCore::HTMLCollection::shouldIncludeChildren):
+        (WebCore::HTMLCollection::isAcceptableElement):
+        * html/HTMLSelectElement.cpp:
+        (WebCore::HTMLSelectElement::selectedOptions):
+        (WebCore):
+        * html/HTMLSelectElement.h:
+        (HTMLSelectElement):
+        * html/HTMLSelectElement.idl:
+
 2012-03-09  Tien-Ren Chen  <trchen@chromium.org>
 

trunk/Source/WebCore/html/CollectionType.h

@@ -52 +52 @@
     TRCells,      // all cells in this row
     SelectOptions,
+    SelectedOptions,
     DataListOptions,
     MapAreas,

trunk/Source/WebCore/html/HTMLCollection.cpp

@@ -62 +62 @@
     case OtherCollection:
     case SelectOptions:
+    case SelectedOptions:
     case DataListOptions:
     case WindowNamedItems:
@@ -115 +116 @@
     case SelectOptions:
         return element->hasLocalName(optionTag);
+    case SelectedOptions:
+        if (element->hasLocalName(optionTag)) {
+            HTMLOptionElement* option = static_cast<HTMLOptionElement*>(element);
+            if (option->selected())
+                return true;
+        }
+        return false;
     case DataListOptions:
         if (element->hasLocalName(optionTag)) {

trunk/Source/WebCore/html/HTMLSelectElement.cpp

@@ -330 +330 @@
 {
     return childContext.isOnEncapsulationBoundary() && HTMLFormControlElementWithState::childShouldCreateRenderer(childContext);
+}
+
+HTMLCollection* HTMLSelectElement::selectedOptions()
+{
+    if (!m_selectedOptionsCollection)
+        m_selectedOptionsCollection = HTMLCollection::create(this, SelectedOptions);
+    return m_selectedOptionsCollection.get();
 }
 

trunk/Source/WebCore/html/HTMLSelectElement.h

@@ -64 +64 @@
 
     HTMLOptionsCollection* options();
+    HTMLCollection* selectedOptions();
 
     void optionElementChildrenChanged();
@@ -179 +180 @@
 
     OwnPtr<HTMLOptionsCollection> m_optionsCollection;
+    OwnPtr<HTMLCollection> m_selectedOptionsCollection;
 
     // m_listItems contains HTMLOptionElement, HTMLOptGroupElement, and HTMLHRElement objects.

trunk/Source/WebCore/html/HTMLSelectElement.idl

@@ -54 +54 @@
         void remove(in long index);
 #endif
+        readonly attribute HTMLCollection selectedOptions;
         attribute long selectedIndex;
         attribute [TreatNullAs=NullString] DOMString value;