[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 f9030452214504999c25e0053e37c081c092262c
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 16 22:01:00 2002 +0000

    	Code needs to go in calcMinMaxWidth instead, so parents computing
    	their own minmax widths will get the correct value during the ifrst
    	pass.  With this change weather.com is actually fixed.
    
            Reviewed by mjs
    
            * khtml/rendering/render_box.cpp:
            (RenderBox::calcWidth):
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::calcMinMaxWidth):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3088 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 06156a2..e60f22c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,18 @@
 2002-12-16  David Hyatt  <hyatt at apple.com>
 
+	Code needs to go in calcMinMaxWidth instead, so parents computing
+	their own minmax widths will get the correct value during the ifrst
+	pass.  With this change weather.com is actually fixed.
+	
+        Reviewed by mjs
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::calcWidth):
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::calcMinMaxWidth):
+
+2002-12-16  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3128843, horked layout on weather.com.  Ensure that
 	overflow: hidden elements bounds-check their minwidth and maxwidth
 	values to ensure that you don't grow the clipped element.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 06156a2..e60f22c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,18 @@
 2002-12-16  David Hyatt  <hyatt at apple.com>
 
+	Code needs to go in calcMinMaxWidth instead, so parents computing
+	their own minmax widths will get the correct value during the ifrst
+	pass.  With this change weather.com is actually fixed.
+	
+        Reviewed by mjs
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::calcWidth):
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::calcMinMaxWidth):
+
+2002-12-16  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3128843, horked layout on weather.com.  Ensure that
 	overflow: hidden elements bounds-check their minwidth and maxwidth
 	values to ensure that you don't grow the clipped element.
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index 37a5c6b..c578816 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -572,12 +572,6 @@ void RenderBox::calcWidth()
         }
     }
 
-    // Scrolling marquees like to use this trick:
-    // <div style="overflow:hidden; width:300px"><nobr>.....[lots of text].....</nobr></div>
-    // We need to sanity-check our m_minWidth, and not let it exceed our clipped boundary. -dwh
-    if (style()->overflow() == OHIDDEN && m_minWidth > m_width)
-        m_minWidth = m_width;
-      
 #ifdef DEBUG_LAYOUT
     kdDebug( 6040 ) << "RenderBox::calcWidth(): m_width=" << m_width << " containingBlockWidth()=" << containingBlockWidth() << endl;
     kdDebug( 6040 ) << "m_marginLeft=" << m_marginLeft << " m_marginRight=" << m_marginRight << endl;
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 1ec2a01..7140877 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -1703,6 +1703,12 @@ void RenderFlow::calcMinMaxWidth()
     m_minWidth += toAdd;
     m_maxWidth += toAdd;
 
+    // Scrolling marquees like to use this trick:
+    // <td><div style="overflow:hidden; width:300px"><nobr>.....[lots of text].....</nobr></div></td>
+    // We need to sanity-check our m_minWidth, and not let it exceed our clipped boundary. -dwh
+    if (style()->overflow() == OHIDDEN && m_minWidth > m_width)
+        m_minWidth = m_width;
+
     setMinMaxKnown();
 
     //kdDebug( 6040 ) << "Text::calcMinMaxWidth(" << this << "): min = " << m_minWidth << " max = " << m_maxWidth << endl;

-- 
WebKit Debian packaging