[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[jhoneycutt at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit ed26f53cb4b8461d889ce1824cd196775f5e4eb4
Author: jhoneycutt at apple.com <jhoneycutt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 17 23:37:59 2009 +0000

    DOMHTMLOptionElement is missing some functionality.
    
    https://bugs.webkit.org/show_bug.cgi?id=31491
    
    Reviewed by Dan Bernstein.
    
    * DOMHTMLClasses.cpp:
    (DOMHTMLOptionElement::text):
    Cast m_element to an HTMLOptionElement, and call its text() function.
    (DOMHTMLOptionElement::label):
    Ditto, for label().
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51093 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index b9a76c1..dc274c1 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,5 +1,19 @@
 2009-11-12  Jon Honeycutt  <jhoneycutt at apple.com>
 
+        DOMHTMLOptionElement is missing some functionality.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31491
+
+        Reviewed by Dan Bernstein.
+
+        * DOMHTMLClasses.cpp:
+        (DOMHTMLOptionElement::text):
+        Cast m_element to an HTMLOptionElement, and call its text() function.
+        (DOMHTMLOptionElement::label):
+        Ditto, for label().
+
+2009-11-12  Jon Honeycutt  <jhoneycutt at apple.com>
+
         DOMHTMLSelectElement is missing some implementation.
 
         https://bugs.webkit.org/show_bug.cgi?id=31489
diff --git a/WebKit/win/DOMHTMLClasses.cpp b/WebKit/win/DOMHTMLClasses.cpp
index 3d09b4a..9a9f573 100644
--- a/WebKit/win/DOMHTMLClasses.cpp
+++ b/WebKit/win/DOMHTMLClasses.cpp
@@ -852,10 +852,19 @@ HRESULT STDMETHODCALLTYPE DOMHTMLOptionElement::setDefaultSelected(
 }
     
 HRESULT STDMETHODCALLTYPE DOMHTMLOptionElement::text( 
-        /* [retval][out] */ BSTR* /*result*/)
+        /* [retval][out] */ BSTR* result)
 {
-    ASSERT_NOT_REACHED();
-    return E_NOTIMPL;
+    if (!result)
+        return E_POINTER;
+
+    *result = 0;
+
+    ASSERT(m_element);
+    ASSERT(m_element->hasTagName(optionTag));
+    HTMLOptionElement* optionElement = static_cast<HTMLOptionElement*>(m_element);
+
+    *result = BString(optionElement->text()).release();
+    return S_OK;
 }
     
 HRESULT STDMETHODCALLTYPE DOMHTMLOptionElement::index( 
@@ -880,10 +889,19 @@ HRESULT STDMETHODCALLTYPE DOMHTMLOptionElement::setDisabled(
 }
     
 HRESULT STDMETHODCALLTYPE DOMHTMLOptionElement::label( 
-        /* [retval][out] */ BSTR* /*result*/)
+        /* [retval][out] */ BSTR* result)
 {
-    ASSERT_NOT_REACHED();
-    return E_NOTIMPL;
+    if (!result)
+        return E_POINTER;
+
+    *result = 0;
+
+    ASSERT(m_element);
+    ASSERT(m_element->hasTagName(optionTag));
+    HTMLOptionElement* optionElement = static_cast<HTMLOptionElement*>(m_element);
+
+    *result = BString(optionElement->label()).release();
+    return S_OK;
 }
     
 HRESULT STDMETHODCALLTYPE DOMHTMLOptionElement::setLabel( 

-- 
WebKit Debian packaging