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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 7ec6f8872a6e18cfd8b57fb5466ac0a7ac4928af
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 3 18:46:10 2003 +0000

    	Remove unneeded style property additions for form controls.  In the KHTML trunk these moved into the UA
    	sheet, but we don't even need them there, since we don't honor any of them.
    
            * khtml/html/html_formimpl.cpp:
            (HTMLInputElementImpl::attach):
            (HTMLSelectElementImpl::attach):
            (HTMLTextAreaElementImpl::attach):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5365 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f68dae0..e9be74f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2003-11-03  David Hyatt  <hyatt at apple.com>
 
+	Remove unneeded style property additions for form controls.  In the KHTML trunk these moved into the UA
+	sheet, but we don't even need them there, since we don't honor any of them.
+
+        * khtml/html/html_formimpl.cpp:
+        (HTMLInputElementImpl::attach):
+        (HTMLSelectElementImpl::attach):
+        (HTMLTextAreaElementImpl::attach):
+
+2003-11-03  David Hyatt  <hyatt at apple.com>
+
 	Patch from KHTML trunk.  Move frameset positioning reset into adjustRenderStyle so as not to
 	pollute the render tree.
 
diff --git a/WebCore/khtml/html/html_formimpl.cpp b/WebCore/khtml/html/html_formimpl.cpp
index 7e27188..1213673 100644
--- a/WebCore/khtml/html/html_formimpl.cpp
+++ b/WebCore/khtml/html/html_formimpl.cpp
@@ -1405,34 +1405,14 @@ void HTMLInputElementImpl::attach()
         m_inited = true;
     }
 
-    // make sure we don't inherit a color to the form elements
-    // by adding a non-CSS color property. this his higher
-    // priority than inherited color, but lesser priority than
-    // any color specified by CSS for the elements.
     switch( m_type ) {
-    case TEXT:
-    case PASSWORD:
-#if !APPLE_CHANGES
-        addCSSProperty(CSS_PROP_FONT_FAMILY, CSS_VAL_MONOSPACE);
-#endif
-        /* nobreak */
-    case ISINDEX:
-    case FILE:
-        addCSSProperty(CSS_PROP_COLOR, "text");
-        break;
-    case SUBMIT:
-    case RESET:
-    case BUTTON:
-    case CHECKBOX:
-    case RADIO:
-        addCSSProperty(CSS_PROP_COLOR, "buttontext");
-        // FIXME: There was no break here in the original KHTML. Was that intentional?
-        break;
     case HIDDEN:
     case IMAGE:
         if (!getAttribute(ATTR_WIDTH).isEmpty())
             addCSSLength(CSS_PROP_WIDTH, getAttribute(ATTR_WIDTH));
         break;
+    default:
+        break;
     }
 
     createRendererIfNeeded();
@@ -2151,8 +2131,6 @@ RenderObject *HTMLSelectElementImpl::createRenderer(RenderArena *arena, RenderSt
 
 void HTMLSelectElementImpl::attach()
 {
-    addCSSProperty(CSS_PROP_COLOR, "text");
-
     createRendererIfNeeded();
     HTMLGenericFormElementImpl::attach();
 }
@@ -2677,8 +2655,6 @@ RenderObject *HTMLTextAreaElementImpl::createRenderer(RenderArena *arena, Render
 
 void HTMLTextAreaElementImpl::attach()
 {
-    addCSSProperty(CSS_PROP_COLOR, "text");
-
     createRendererIfNeeded();
     HTMLGenericFormElementImpl::attach();
 }

-- 
WebKit Debian packaging