[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 d8d042fbd0f2fbb26e7324103e8bcca0c0b032e6
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 16 21:42:46 2002 +0000

    	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.
    
            Reviewed by mjs
    
            * khtml/rendering/render_box.cpp:
            (RenderBox::calcWidth):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3087 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 2aa6a3f..06156a2 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+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.
+	
+        Reviewed by mjs
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::calcWidth):
+
 2002-12-16  Trey Matteson  <trey at apple.com>
 
 	3129175 - we're doing needless GETs when using b/f cache
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 2aa6a3f..06156a2 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+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.
+	
+        Reviewed by mjs
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::calcWidth):
+
 2002-12-16  Trey Matteson  <trey at apple.com>
 
 	3129175 - we're doing needless GETs when using b/f cache
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index c578816..37a5c6b 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -572,6 +572,12 @@ 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;

-- 
WebKit Debian packaging