[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 f201e4ed682eea0ed98a6e42eaab91f2de89a2f8
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed May 14 20:27:01 2003 +0000

    	Fix for 3258389, min-width should take precedence over max-width.
    	I just had an "else" that shouldn't have been there, so that
    	min-width would get checked even if max-width was also checked.
    
            Reviewed by NOBODY (OOPS!).
    
            * khtml/rendering/render_box.cpp:
            (RenderBox::calcWidth):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4373 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 80e2f6f..066fe7f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-05-14  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3258389, min-width should take precedence over max-width.
+	I just had an "else" that shouldn't have been there, so that
+	min-width would get checked even if max-width was also checked.
+	
+        Reviewed by NOBODY (OOPS!).
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::calcWidth):
+
 2003-05-14  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Don.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 80e2f6f..066fe7f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-05-14  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3258389, min-width should take precedence over max-width.
+	I just had an "else" that shouldn't have been there, so that
+	min-width would get checked even if max-width was also checked.
+	
+        Reviewed by NOBODY (OOPS!).
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::calcWidth):
+
 2003-05-14  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Don.
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index 2176403..25004b6 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -659,7 +659,7 @@ void RenderBox::calcWidth()
                     m_width = maxW;
                     widthType = maxWidthType;
                 }
-                else if (m_width < minW) {
+                if (m_width < minW) {
                     m_width = minW;
                     widthType = minWidthType;
                 }

-- 
WebKit Debian packaging