[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 b5aef7cb57e9748950e695a5298b1613f3243218
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 3 01:22:09 2003 +0000

    	Fix for 3212011.  Avoid applying a fixup to the minwidth
    	of overflow:hidden table cells, since we don't really have
    	an accurate width to compare against.
    
    	I filed followup bug 3216709 to deal with the fact that this
    	fixup has been disabled.
    
            Reviewed by john
    
            * khtml/rendering/render_block.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4008 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f94492a..0ec6e0c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,18 @@
 2003-04-02  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3212011.  Avoid applying a fixup to the minwidth
+	of overflow:hidden table cells, since we don't really have
+	an accurate width to compare against.
+
+	I filed followup bug 3216709 to deal with the fact that this
+	fixup has been disabled.
+	
+        Reviewed by john
+
+        * khtml/rendering/render_block.cpp:
+
+2003-04-02  David Hyatt  <hyatt at apple.com>
+
 	Do not assume all columns have a minwidth/maxwidth of 1px.
 	Instead give them a min/maxwidth of 0px, and only inflate to
 	1px if a cell originates in the column.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f94492a..0ec6e0c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,18 @@
 2003-04-02  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3212011.  Avoid applying a fixup to the minwidth
+	of overflow:hidden table cells, since we don't really have
+	an accurate width to compare against.
+
+	I filed followup bug 3216709 to deal with the fact that this
+	fixup has been disabled.
+	
+        Reviewed by john
+
+        * khtml/rendering/render_block.cpp:
+
+2003-04-02  David Hyatt  <hyatt at apple.com>
+
 	Do not assume all columns have a minwidth/maxwidth of 1px.
 	Instead give them a min/maxwidth of 0px, and only inflate to
 	1px if a cell originates in the column.
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index b3cf5bd..6920c7b 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -1820,7 +1820,9 @@ void RenderBlock::calcMinMaxWidth()
     // 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)
+    // FIXME: For now, punt on trying to apply this fix to table cells.  We don't know an accurate
+    // width for the cell here, so we can't do a comparison.
+    if (style()->overflow() == OHIDDEN && m_minWidth > m_width && !isTableCell())
         m_minWidth = m_width;
 
     setMinMaxKnown();

-- 
WebKit Debian packaging