[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 91e4b4f815c50940153aee6fdf86fae77758dc47
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 18 20:54:11 2003 +0000

    Accidentally removed a FIXME comment. Putting it back.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5208 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index 602dd1a..ea0678f 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -1985,7 +1985,8 @@ void RenderBlock::calcMinMaxWidth()
         else
             m_minWidth = m_maxWidth = short(style()->width().value);
     }
-    
+    // FIXME: also compare with min/max width CSS properties...
+
     int toAdd = 0;
     toAdd = borderLeft() + borderRight() + paddingLeft() + paddingRight();
 
diff --git a/WebCore/khtml/rendering/render_flexbox.cpp b/WebCore/khtml/rendering/render_flexbox.cpp
index ac44249..22b457a 100644
--- a/WebCore/khtml/rendering/render_flexbox.cpp
+++ b/WebCore/khtml/rendering/render_flexbox.cpp
@@ -220,7 +220,8 @@ void RenderFlexibleBox::calcMinMaxWidth()
 
     if (style()->width().isFixed() && style()->width().value > 0)
         m_minWidth = m_maxWidth = short(style()->width().value);
-    
+    // FIXME: also compare with min/max width CSS properties...
+
     int toAdd = borderLeft() + borderRight() + paddingLeft() + paddingRight();
     m_minWidth += toAdd;
     m_maxWidth += toAdd;

-- 
WebKit Debian packaging