[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 a551c7833125155e050233a8454b86f1392fac6f
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 10 22:00:56 2002 +0000

    	Fix for 3116996.  My hack to make selects ignore fixed CSS
    	widths that are smaller than their intrinsic width was not
    	good.  Remove the hack.
    
            Reviewed by darin
    
            * khtml/rendering/render_box.cpp:
            (RenderBox::calcReplacedWidth):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2988 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a9cb6ce..691fe82 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2002-12-10  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3116996.  My hack to make selects ignore fixed CSS
+	widths that are smaller than their intrinsic width was not
+	good.  Remove the hack.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::calcReplacedWidth):
+
 2002-12-10  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a9cb6ce..691fe82 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2002-12-10  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3116996.  My hack to make selects ignore fixed CSS
+	widths that are smaller than their intrinsic width was not
+	good.  Remove the hack.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::calcReplacedWidth):
+
 2002-12-10  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index 9f404c2..be791d2 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -738,12 +738,7 @@ short RenderBox::calcReplacedWidth(bool* ieHack) const
         break;
     }
     case Fixed:
-        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();
-        else
-            width = w.value;
+        width = w.value;
         break;
     default:
         width = intrinsicWidth();

-- 
WebKit Debian packaging