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

hyatt hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:00:45 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 5ee8b596bbca730ac1291efed7dfd1ecf4a78088
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 15 02:23:19 2002 +0000

    	Fix spinner.com mislayout on the PLT.  Make sure
    	<input type=image> honors the width attribute and
    	make sure that its render object calls updateFromElement.
    
            * khtml/html/html_formimpl.cpp:
            (HTMLInputElementImpl::parseAttribute):
            (HTMLInputElementImpl::attach):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2682 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index b18c085..a4cc44f 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,15 @@
 2002-11-14  David Hyatt  <hyatt at apple.com>
 
+	Fix spinner.com mislayout on the PLT.  Make sure 
+	<input type=image> honors the width attribute and
+	make sure that its render object calls updateFromElement.
+	
+        * khtml/html/html_formimpl.cpp:
+        (HTMLInputElementImpl::parseAttribute):
+        (HTMLInputElementImpl::attach):
+
+2002-11-14  David Hyatt  <hyatt at apple.com>
+
 	Move text measurement and layout beyond onload.  This
 	shoudl speed up i-bench substantially and morrison's
 	PLT test slightly.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b18c085..a4cc44f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
 2002-11-14  David Hyatt  <hyatt at apple.com>
 
+	Fix spinner.com mislayout on the PLT.  Make sure 
+	<input type=image> honors the width attribute and
+	make sure that its render object calls updateFromElement.
+	
+        * khtml/html/html_formimpl.cpp:
+        (HTMLInputElementImpl::parseAttribute):
+        (HTMLInputElementImpl::attach):
+
+2002-11-14  David Hyatt  <hyatt at apple.com>
+
 	Move text measurement and layout beyond onload.  This
 	shoudl speed up i-bench substantially and morrison's
 	PLT test slightly.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b18c085..a4cc44f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2002-11-14  David Hyatt  <hyatt at apple.com>
 
+	Fix spinner.com mislayout on the PLT.  Make sure 
+	<input type=image> honors the width attribute and
+	make sure that its render object calls updateFromElement.
+	
+        * khtml/html/html_formimpl.cpp:
+        (HTMLInputElementImpl::parseAttribute):
+        (HTMLInputElementImpl::attach):
+
+2002-11-14  David Hyatt  <hyatt at apple.com>
+
 	Move text measurement and layout beyond onload.  This
 	shoudl speed up i-bench substantially and morrison's
 	PLT test slightly.
diff --git a/WebCore/khtml/html/html_formimpl.cpp b/WebCore/khtml/html/html_formimpl.cpp
index cf77981..cd77720 100644
--- a/WebCore/khtml/html/html_formimpl.cpp
+++ b/WebCore/khtml/html/html_formimpl.cpp
@@ -1003,7 +1003,8 @@ void HTMLInputElementImpl::parseAttribute(AttributeImpl *attr)
         break;
     case ATTR_WIDTH:
         // ignore this attribute,  do _not_ add
-        // a CSS_PROP_WIDTH here!
+        // a CSS_PROP_WIDTH here (we will honor this attribute for input type=image
+        // in the attach call)!
         // webdesigner are stupid - and IE/NS behave the same ( Dirk )
         break;
     case ATTR_HEIGHT:
@@ -1086,7 +1087,20 @@ void HTMLInputElementImpl::attach()
         case CHECKBOX:  m_render = new (arena) RenderCheckBox(this); break;
         case RADIO:        m_render = new (arena) RenderRadioButton(this); break;
         case SUBMIT:      m_render = new (arena) RenderSubmitButton(this); break;
-        case IMAGE:       m_render =  new (arena) RenderImageButton(this); break;
+        case IMAGE: {
+             DOMString width = getAttribute( ATTR_WIDTH );
+             if (!width.isEmpty()) {
+                printf("Added prop.\n");
+                addCSSLength(CSS_PROP_WIDTH, width);
+             }
+             m_render =  new (arena) RenderImageButton(this);
+             m_render->setStyle(getDocument()->styleSelector()->styleForElement(this));
+             parentNode()->renderer()->addChild(m_render, nextRenderer());
+             m_render->updateFromElement();
+             NodeBaseImpl::attach();
+             _style->deref();
+             return;
+        }
         case RESET:      m_render = new (arena) RenderResetButton(this);   break;
         case FILE:         m_render =  new (arena) RenderFileButton(this);    break;
         case BUTTON:  m_render = new (arena) RenderPushButton(this);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list