Changeset 120413 in webkit


Ignore:
Timestamp:
Jun 15, 2012, 12:13:35 AM (13 years ago)
Author:
tkent@chromium.org
Message:

Unreviewed, rolling out r110340.
​http://trac.webkit.org/changeset/110340
​https://bugs.webkit.org/show_bug.cgi?id=88749

Source/WebCore:

r110340 added a broken implementation of
HTMLSelectElement::selectedOptions. This roll out removes
HTMLSelectElement::selectedOptions.

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

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

  • html/HTMLSelectElement.cpp:
  • html/HTMLSelectElement.h:

(HTMLSelectElement):

  • html/HTMLSelectElement.idl:

LayoutTests:

  • fast/dom/HTMLSelectElement/select-selectedOptions-expected.txt: Removed.
  • fast/dom/HTMLSelectElement/select-selectedOptions.html: Removed.
Location:
trunk
Files:
2 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r120412 r120413  
     12012-06-14  Kent Tamura  <tkent@chromium.org>
     2
     3        Unreviewed, rolling out r110340.
     4        http://trac.webkit.org/changeset/110340
     5        https://bugs.webkit.org/show_bug.cgi?id=88749
     6
     7        * fast/dom/HTMLSelectElement/select-selectedOptions-expected.txt: Removed.
     8        * fast/dom/HTMLSelectElement/select-selectedOptions.html: Removed.
     9
    1102012-06-15  MORITA Hajime  <morrita@google.com>
    211

  • trunk/Source/WebCore/ChangeLog

    r120411 r120413  
     12012-06-14  Kent Tamura  <tkent@chromium.org>
     2
     3        Unreviewed, rolling out r110340.
     4        http://trac.webkit.org/changeset/110340
     5        https://bugs.webkit.org/show_bug.cgi?id=88749
     6
     7        r110340 added a broken implementation of
     8        HTMLSelectElement::selectedOptions. This roll out removes
     9        HTMLSelectElement::selectedOptions.
     10
     11        * html/CollectionType.h:
     12        * html/HTMLCollection.cpp:
     13        (WebCore::HTMLCollection::shouldIncludeChildren):
     14        (WebCore::HTMLCollection::isAcceptableElement):
     15        * html/HTMLSelectElement.cpp:
     16        * html/HTMLSelectElement.h:
     17        (HTMLSelectElement):
     18        * html/HTMLSelectElement.idl:
     19
    1202012-06-14  Keishi Hattori  <keishi@webkit.org>
    221

  • trunk/Source/WebCore/html/CollectionType.h

    r116487 r120413  
    5252    TRCells,      // all cells in this row
    5353    SelectOptions,
    54     SelectedOptions,
    5554    DataListOptions,
    5655    MapAreas,

  • trunk/Source/WebCore/html/HTMLCollection.cpp

    r116487 r120413  
    6262    case OtherCollection:
    6363    case SelectOptions:
    64     case SelectedOptions:
    6564    case DataListOptions:
    6665    case WindowNamedItems:
    … …  
    120119    case SelectOptions:
    121120        return element->hasLocalName(optionTag);
    122     case SelectedOptions:
    123         if (element->hasLocalName(optionTag)) {
    124             HTMLOptionElement* option = static_cast<HTMLOptionElement*>(element);
    125             if (option->selected())
    126                 return true;
    127         }
    128         return false;
    129121    case DataListOptions:
    130122        if (element->hasLocalName(optionTag)) {

  • trunk/Source/WebCore/html/HTMLSelectElement.cpp

    r120049 r120413  
    348348{
    349349    return childContext.isOnUpperEncapsulationBoundary() && HTMLFormControlElementWithState::childShouldCreateRenderer(childContext);
    350 }
    351 
    352 HTMLCollection* HTMLSelectElement::selectedOptions()
    353 {
    354     if (!m_selectedOptionsCollection)
    355         m_selectedOptionsCollection = HTMLCollection::create(this, SelectedOptions);
    356     return m_selectedOptionsCollection.get();
    357350}
    358351

  • trunk/Source/WebCore/html/HTMLSelectElement.h

    r118192 r120413  
    6565
    6666    HTMLOptionsCollection* options();
    67     HTMLCollection* selectedOptions();
    6867
    6968    void optionElementChildrenChanged();
    … …  
    181180
    182181    OwnPtr<HTMLOptionsCollection> m_optionsCollection;
    183     OwnPtr<HTMLCollection> m_selectedOptionsCollection;
    184182
    185183    // m_listItems contains HTMLOptionElement, HTMLOptGroupElement, and HTMLHRElement objects.

  • trunk/Source/WebCore/html/HTMLSelectElement.idl

    r120049 r120413  
    5454        void remove(in long index);
    5555#endif
    56         readonly attribute HTMLCollection selectedOptions;
    5756        attribute long selectedIndex;
    5857        attribute [TreatNullAs=NullString] DOMString value;
Note: See TracChangeset for help on using the changeset viewer.