[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 134460acd6985c224b7eb759a4a41e2db2b6c9b0
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 23 03:43:27 2002 +0000

    	Make <select>s and <button>s ignore a CSS-specified width if that
    	width is smaller than their intrinsic width.
    
    	Fixes the <select> at the top of livepage.apple.com.
    
            * khtml/rendering/render_box.cpp:
            (RenderBox::calcReplacedWidth):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2839 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 539f71d..b1ab4a3 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+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.
+
+	Fixes the <select> at the top of livepage.apple.com.
+	
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::calcReplacedWidth):
+
 2002-11-22  Darin Adler  <darin at apple.com>
 
 	- started checking in all our generated source files for the benefit of B&I
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 539f71d..b1ab4a3 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+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.
+
+	Fixes the <select> at the top of livepage.apple.com.
+	
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::calcReplacedWidth):
+
 2002-11-22  Darin Adler  <darin at apple.com>
 
 	- started checking in all our generated source files for the benefit of B&I
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 539f71d..b1ab4a3 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+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.
+
+	Fixes the <select> at the top of livepage.apple.com.
+	
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::calcReplacedWidth):
+
 2002-11-22  Darin Adler  <darin at apple.com>
 
 	- started checking in all our generated source files for the benefit of B&I
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index af9a659..15a81ae 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -658,7 +658,13 @@ short RenderBox::calcReplacedWidth(bool* ieHack) const
         break;
     }
     case Fixed:
-        width = w.value;
+        if (isFormElement() && (element()->id() == ID_SELECT || element()->id() == ID_BUTTON)
+            && w.value < intrinsicWidth())
+            // Disallow a CSS width that is too small to enclose the contents
+            // of the list.
+            width = intrinsicWidth();
+        else
+            width = w.value;
         break;
     default:
         width = intrinsicWidth();

-- 
WebKit Debian packaging