Changeset 51092 in webkit

Timestamp:

Nov 17, 2009 3:37:48 PM (14 years ago)

Author:

jhoneycutt@apple.com

Message:

DOMHTMLSelectElement is missing some implementation.

​https://bugs.webkit.org/show_bug.cgi?id=31489

Reviewed by Dan Bernstein.

• DOMHTMLClasses.cpp:

(DOMHTMLSelectElement::options):
Cast m_element to an HTMLSelectElement. If it has no options, return
E_FAIL. Otherwise, create a DOMHTMLOptionsCollection to wrap the
options, and return it.
(DOMHTMLSelectElement::activateItemAtIndex):
If the index is out of bounds, return E_FAIL. Otherwise, select the
item.

Location:

trunk/WebKit/win

Files:

• ChangeLog (modified) (1 diff)
• DOMHTMLClasses.cpp (modified) (2 diffs)

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2009-11-12  Jon Honeycutt  <jhoneycutt@apple.com>
+
+        DOMHTMLSelectElement is missing some implementation.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31489
+
+        Reviewed by Dan Bernstein.
+
+        * DOMHTMLClasses.cpp:
+        (DOMHTMLSelectElement::options):
+        Cast m_element to an HTMLSelectElement. If it has no options, return
+        E_FAIL. Otherwise, create a DOMHTMLOptionsCollection to wrap the
+        options, and return it.
+        (DOMHTMLSelectElement::activateItemAtIndex):
+        If the index is out of bounds, return E_FAIL. Otherwise, select the
+        item.
+
 2009-11-12  Jon Honeycutt  <jhoneycutt@apple.com>
 

trunk/WebKit/win/DOMHTMLClasses.cpp

@@ -696 +696 @@
     
 HRESULT STDMETHODCALLTYPE DOMHTMLSelectElement::options( 
-        /* [retval][out] */ IDOMHTMLOptionsCollection** /*result*/)
-{
-    ASSERT_NOT_REACHED();
-    return E_NOTIMPL;
+        /* [retval][out] */ IDOMHTMLOptionsCollection** result)
+{
+    if (!result)
+        return E_POINTER;
+
+    *result = 0;
+
+    ASSERT(m_element);
+    ASSERT(m_element->hasTagName(selectTag));
+    HTMLSelectElement* selectElement = static_cast<HTMLSelectElement*>(m_element);
+
+    if (!selectElement->options())
+        return E_FAIL;
+
+    *result = DOMHTMLOptionsCollection::createInstance(selectElement->options().get());
+    return S_OK;
 }
     
@@ -790 +802 @@
 
 HRESULT STDMETHODCALLTYPE DOMHTMLSelectElement::activateItemAtIndex( 
-    /* [in] */ int /*index*/)
-{
-    ASSERT_NOT_REACHED();
-    return E_NOTIMPL;    
+    /* [in] */ int index)
+{
+    ASSERT(m_element);
+    ASSERT(m_element->hasTagName(selectTag));
+    HTMLSelectElement* selectElement = static_cast<HTMLSelectElement*>(m_element);
+
+    if (index >= selectElement->length())
+        return E_FAIL;
+
+    selectElement->setSelectedIndex(index);
+    return S_OK;
 }