[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 dc56b2e8d7e072f563f74d20c872d054b7eb94ae
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 21 03:21:37 2002 +0000

    	Fix for 3134163, a regression from the reduction of
    	styleForElement calls.  Make sure image buttons
    	get the width attribute and add it to style info
    	before styleForElement gets called.
    
            Reviewed by rjw
    
            * khtml/html/html_formimpl.cpp:
            (HTMLInputElementImpl::attach):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3167 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7d0ae26..9c01e64 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,17 @@
 2002-12-20  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3134163, a regression from the reduction of
+	styleForElement calls.  Make sure image buttons
+	get the width attribute and add it to style info
+	before styleForElement gets called.
+	
+        Reviewed by rjw
+
+        * khtml/html/html_formimpl.cpp:
+        (HTMLInputElementImpl::attach):
+
+2002-12-20  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3134133. Back out the render_text code I gave to rjw
 	to check in.  It wasn't filling in a value for hasBreak, so it
 	became random whether or not you'd break or not.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7d0ae26..9c01e64 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,17 @@
 2002-12-20  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3134163, a regression from the reduction of
+	styleForElement calls.  Make sure image buttons
+	get the width attribute and add it to style info
+	before styleForElement gets called.
+	
+        Reviewed by rjw
+
+        * khtml/html/html_formimpl.cpp:
+        (HTMLInputElementImpl::attach):
+
+2002-12-20  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3134133. Back out the render_text code I gave to rjw
 	to check in.  It wasn't filling in a value for hasBreak, so it
 	became random whether or not you'd break or not.
diff --git a/WebCore/khtml/html/html_formimpl.cpp b/WebCore/khtml/html/html_formimpl.cpp
index d8ffc48..f5f1c1b 100644
--- a/WebCore/khtml/html/html_formimpl.cpp
+++ b/WebCore/khtml/html/html_formimpl.cpp
@@ -1225,6 +1225,16 @@ void HTMLInputElementImpl::attach()
     assert(!m_render);
     assert(parentNode());
 
+    // We had to wait until the attach call to do this, because we don't yet know
+    // our type in parseAttribute.  This also has to be done *before* we do
+    // styleForElement, or the width info will not get used.  This fixes
+    // spinner.com on the PLT -dwh. 
+    if (m_type == IMAGE && parentNode()->renderer()) {
+        DOMString width = getAttribute( ATTR_WIDTH );
+        if (!width.isEmpty())
+            addCSSLength(CSS_PROP_WIDTH, width);
+    }
+    
     RenderStyle* _style = getDocument()->styleSelector()->styleForElement(this);
     _style->ref();
     if (parentNode()->renderer() && _style->display() != NONE) {
@@ -1238,10 +1248,6 @@ void HTMLInputElementImpl::attach()
         case RADIO:    m_render = new (arena) RenderRadioButton(this);  break;
         case SUBMIT:   m_render = new (arena) RenderSubmitButton(this); break;
         case IMAGE: {
-             DOMString width = getAttribute( ATTR_WIDTH );
-             if (!width.isEmpty()) {
-                addCSSLength(CSS_PROP_WIDTH, width);
-             }
              m_render =  new (arena) RenderImageButton(this);
              m_render->setStyle(_style);
              parentNode()->renderer()->addChild(m_render, nextRenderer());

-- 
WebKit Debian packaging