[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 1a3e9647ee224335425b495e4e7db38fc13eaf8b
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Apr 29 00:12:07 2003 +0000

            Reviewed by John.
    
            - re-fixed 3159076 -- turbotax.intuit.com forms have text fields instead of radio buttons
    
            * khtml/html/html_formimpl.cpp:  (HTMLInputElementImpl::attach): Only set the type
            if JavaScript hasn't set it explicitly already.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4201 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 8a22c20..706915b 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-04-28  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+        - re-fixed 3159076 -- turbotax.intuit.com forms have text fields instead of radio buttons
+
+        * khtml/html/html_formimpl.cpp:  (HTMLInputElementImpl::attach): Only set the type
+        if JavaScript hasn't set it explicitly already.
+
 2003-04-25  David Hyatt  <hyatt at apple.com>
 
 	Part two of the overflow patch.  This adds the scrollbars and
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8a22c20..706915b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-04-28  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+        - re-fixed 3159076 -- turbotax.intuit.com forms have text fields instead of radio buttons
+
+        * khtml/html/html_formimpl.cpp:  (HTMLInputElementImpl::attach): Only set the type
+        if JavaScript hasn't set it explicitly already.
+
 2003-04-25  David Hyatt  <hyatt at apple.com>
 
 	Part two of the overflow patch.  This adds the scrollbars and
diff --git a/WebCore/khtml/html/html_formimpl.cpp b/WebCore/khtml/html/html_formimpl.cpp
index 9a75172..efed1a6 100644
--- a/WebCore/khtml/html/html_formimpl.cpp
+++ b/WebCore/khtml/html/html_formimpl.cpp
@@ -1308,7 +1308,8 @@ RenderObject *HTMLInputElementImpl::createRenderer(RenderArena *arena, RenderSty
 void HTMLInputElementImpl::attach()
 {
     if (!m_inited) {
-        setType(getAttribute(ATTR_TYPE));
+        if (!m_haveType)
+            setType(getAttribute(ATTR_TYPE));
 
         if (m_type != FILE) m_value = getAttribute(ATTR_VALUE);
         if ((uint) m_type <= ISINDEX && !m_value.isEmpty()) {

-- 
WebKit Debian packaging