[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 1e3c944cfe81713daeb4a61e0dbcb022ca9d8861
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 24 22:23:53 2003 +0000

            Reviewed by Maciej.
    
    	- fixed 3058229 -- two failures in DOM test page for HTMLSelectElement
            - fixed 3138938 -- choose another member name on .Mac signup not working as expected
            - fixed 3155763 -- Safari autoselects first item in a WOBrowser/<select>
    
            * khtml/html/html_formimpl.cpp:
            (HTMLSelectElementImpl::value): Return "" rather than null when nothing is selected.
            (HTMLSelectElementImpl::recalcListItems): Don't automatically select a first item
    	in the single selection case.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3450 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3b9ecc2..8fc45d7 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2003-01-24  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+	- fixed 3058229 -- two failures in DOM test page for HTMLSelectElement
+        - fixed 3138938 -- choose another member name on .Mac signup not working as expected
+        - fixed 3155763 -- Safari autoselects first item in a WOBrowser/<select>
+
+        * khtml/html/html_formimpl.cpp:
+        (HTMLSelectElementImpl::value): Return "" rather than null when nothing is selected.
+        (HTMLSelectElementImpl::recalcListItems): Don't automatically select a first item
+	in the single selection case.
+
 2003-01-24  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3146066, messed up lists on dictionary.com.  Make
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3b9ecc2..8fc45d7 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2003-01-24  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+	- fixed 3058229 -- two failures in DOM test page for HTMLSelectElement
+        - fixed 3138938 -- choose another member name on .Mac signup not working as expected
+        - fixed 3155763 -- Safari autoselects first item in a WOBrowser/<select>
+
+        * khtml/html/html_formimpl.cpp:
+        (HTMLSelectElementImpl::value): Return "" rather than null when nothing is selected.
+        (HTMLSelectElementImpl::recalcListItems): Don't automatically select a first item
+	in the single selection case.
+
 2003-01-24  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3146066, messed up lists on dictionary.com.  Make
diff --git a/WebCore/khtml/html/html_formimpl.cpp b/WebCore/khtml/html/html_formimpl.cpp
index 355a2e8..8674a34 100644
--- a/WebCore/khtml/html/html_formimpl.cpp
+++ b/WebCore/khtml/html/html_formimpl.cpp
@@ -1774,7 +1774,7 @@ DOMString HTMLSelectElementImpl::value( )
             && static_cast<HTMLOptionElementImpl*>(items[i])->selected())
             return static_cast<HTMLOptionElementImpl*>(items[i])->value();
     }
-    return DOMString();
+    return DOMString("");
 }
 
 void HTMLSelectElementImpl::setValue(DOMStringImpl* /*value*/)
@@ -2016,12 +2016,10 @@ void HTMLSelectElementImpl::recalcListItems()
         if (current->id() == ID_OPTION) {
             m_listItems.resize(m_listItems.size()+1);
             m_listItems[m_listItems.size()-1] = static_cast<HTMLGenericFormElementImpl*>(current);
-            if (!foundSelected && !m_multiple) {
-                foundSelected = static_cast<HTMLOptionElementImpl*>(current);
-                foundSelected->m_selected = true;
-            }
-            else if (foundSelected && !m_multiple && static_cast<HTMLOptionElementImpl*>(current)->selected()) {
-                foundSelected->m_selected = false;
+            if (!m_multiple && static_cast<HTMLOptionElementImpl*>(current)->selected()) {
+                if (foundSelected) {
+                    foundSelected->m_selected = false;
+                }
                 foundSelected = static_cast<HTMLOptionElementImpl*>(current);
             }
         }

-- 
WebKit Debian packaging