[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 85ef236b89df40aec93b4bedefd1adb2e4c18261
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 23 03:53:39 2002 +0000

    	Oops. I meant to do that for <input type=button> and not
    	<button>.  Just do it for <select>s for now.
    
            * khtml/rendering/render_box.cpp:
            (RenderBox::calcReplacedWidth):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2840 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index b1ab4a3..7f15a22 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-11-22  David Hyatt  <hyatt at apple.com>
 
+	Oops. I meant to do that for <input type=button> and not
+	<button>.  Just do it for <select>s for now.
+	
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::calcReplacedWidth):
+
+2002-11-22  David Hyatt  <hyatt at apple.com>
+
 	Make <select>s and <button>s ignore a CSS-specified width if that
 	width is smaller than their intrinsic width.
 
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b1ab4a3..7f15a22 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,13 @@
 2002-11-22  David Hyatt  <hyatt at apple.com>
 
+	Oops. I meant to do that for <input type=button> and not
+	<button>.  Just do it for <select>s for now.
+	
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::calcReplacedWidth):
+
+2002-11-22  David Hyatt  <hyatt at apple.com>
+
 	Make <select>s and <button>s ignore a CSS-specified width if that
 	width is smaller than their intrinsic width.
 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b1ab4a3..7f15a22 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2002-11-22  David Hyatt  <hyatt at apple.com>
 
+	Oops. I meant to do that for <input type=button> and not
+	<button>.  Just do it for <select>s for now.
+	
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::calcReplacedWidth):
+
+2002-11-22  David Hyatt  <hyatt at apple.com>
+
 	Make <select>s and <button>s ignore a CSS-specified width if that
 	width is smaller than their intrinsic width.
 
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index 15a81ae..e0a2b69 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -658,8 +658,7 @@ short RenderBox::calcReplacedWidth(bool* ieHack) const
         break;
     }
     case Fixed:
-        if (isFormElement() && (element()->id() == ID_SELECT || element()->id() == ID_BUTTON)
-            && w.value < intrinsicWidth())
+        if (isFormElement() && element()->id() == ID_SELECT && w.value < intrinsicWidth())
             // Disallow a CSS width that is too small to enclose the contents
             // of the list.
             width = intrinsicWidth();

-- 
WebKit Debian packaging