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

[trey]

The following commit has been merged in the debian/unstable branch:
commit 4157cb307cbc69eb1bf481f0d4f8d144ceaf0609
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 30 21:41:57 2003 +0000

    	3160565 - REGRESSION: Can't log in to etrade
    
    	Fix regression caused by fixed to 3058229.  We auto-select an item of a select element
    	if it is size=1 or size is unset (m_size==0 in the code).
    
    	This gives us conformance with WinIE.  The test at dbaron.org fails us for the
    	case of a disabled list with no size and no initial selection.
    
            Reviewed by Darin.
    
            * khtml/html/html_formimpl.cpp:
            (HTMLSelectElementImpl::recalcListItems):  Auto-select an item if size==1 or is unset.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3511 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 42dfc0f..cc08c58 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,18 @@
+2003-01-30  Trey Matteson  <trey at apple.com>
+
+	3160565 - REGRESSION: Can't log in to etrade
+
+	Fix regression caused by fixed to 3058229.  We auto-select an item of a select element
+	if it is size=1 or size is unset (m_size==0 in the code).
+
+	This gives us conformance with WinIE.  The test at dbaron.org fails us for the
+	case of a disabled list with no size and no initial selection.
+
+        Reviewed by Darin.
+
+        * khtml/html/html_formimpl.cpp:
+        (HTMLSelectElementImpl::recalcListItems):  Auto-select an item if size==1 or is unset.
+
 2003-01-30  David Hyatt  <hyatt at apple.com>
 
 	Make quirk bits part of the bitfield to shrink RenderFlows.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 42dfc0f..cc08c58 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2003-01-30  Trey Matteson  <trey at apple.com>
+
+	3160565 - REGRESSION: Can't log in to etrade
+
+	Fix regression caused by fixed to 3058229.  We auto-select an item of a select element
+	if it is size=1 or size is unset (m_size==0 in the code).
+
+	This gives us conformance with WinIE.  The test at dbaron.org fails us for the
+	case of a disabled list with no size and no initial selection.
+
+        Reviewed by Darin.
+
+        * khtml/html/html_formimpl.cpp:
+        (HTMLSelectElementImpl::recalcListItems):  Auto-select an item if size==1 or is unset.
+
 2003-01-30  David Hyatt  <hyatt at apple.com>
 
 	Make quirk bits part of the bitfield to shrink RenderFlows.
diff --git a/WebCore/khtml/html/html_formimpl.cpp b/WebCore/khtml/html/html_formimpl.cpp
index 841fad4..dc29714 100644
--- a/WebCore/khtml/html/html_formimpl.cpp
+++ b/WebCore/khtml/html/html_formimpl.cpp
@@ -2016,10 +2016,12 @@ 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 (!m_multiple && static_cast<HTMLOptionElementImpl*>(current)->selected()) {
-                if (foundSelected) {
-                    foundSelected->m_selected = false;
-                }
+            if (!foundSelected && !m_multiple && m_size <= 1) {
+                foundSelected = static_cast<HTMLOptionElementImpl*>(current);
+                foundSelected->m_selected = true;
+            }
+            else if (foundSelected && !m_multiple && static_cast<HTMLOptionElementImpl*>(current)->selected()) {
+                foundSelected->m_selected = false;
                 foundSelected = static_cast<HTMLOptionElementImpl*>(current);
             }
         }

-- 
WebKit Debian packaging