[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 6fe835045d4b2c81747c468c4bcf79b3ab7e4ae3
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 15 00:16:06 2004 +0000

    	Fix for 3527819, marquee makes page layout too wide.  Make sure marquees have a minimum width of 0.
    
            Reviewed by john
    
            * khtml/rendering/render_block.cpp:
            (khtml::RenderBlock::calcMinMaxWidth):
            (khtml::RenderBlock::calcInlineMinMaxWidth):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5902 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index fb86e17..6a25987 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-01-14  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3527819, marquee makes page layout too wide.  Make sure marquees have a minimum width of 0.
+	
+        Reviewed by john
+
+        * khtml/rendering/render_block.cpp:
+        (khtml::RenderBlock::calcMinMaxWidth):
+        (khtml::RenderBlock::calcInlineMinMaxWidth):
+
 2004-01-13  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3527707, crash on w3c css page.  Make sure height isn't allowed to be negative when computing
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index 42737ae..5f7a6cc 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -1992,8 +1992,14 @@ void RenderBlock::calcMinMaxWidth()
 
     if(m_maxWidth < m_minWidth) m_maxWidth = m_minWidth;
 
-    if (preOrNowrap && childrenInline())
+    if (preOrNowrap && childrenInline()) {
         m_minWidth = m_maxWidth;
+        
+        // A horizontal marquee with inline children has no minimum width.
+        if (style()->overflow() == OMARQUEE && m_layer && m_layer->marquee() && 
+            m_layer->marquee()->isHorizontal() && !m_layer->marquee()->isUnfurlMarquee())
+            m_minWidth = 0;
+    }
 
     if (style()->width().isFixed() && style()->width().value > 0) {
         if (isTableCell())
@@ -2354,6 +2360,7 @@ void RenderBlock::calcInlineMinMaxWidth()
     
     if(m_minWidth < inlineMin) m_minWidth = inlineMin;
     if(m_maxWidth < inlineMax) m_maxWidth = inlineMax;
+
     //         kdDebug( 6040 ) << "m_minWidth=" << m_minWidth
     // 			<< " m_maxWidth=" << m_maxWidth << endl;
 }

-- 
WebKit Debian packaging