[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 0780eb60efd82e7e1071a0848c3017fdb5146d93
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 7 01:14:33 2003 +0000

    	Fix for 3156125, regression on hiptop.com.  Caused by better
    	nowrap handling perversely enough.  Need another quirk from
    	Moz/WinIE to make this site behave.
    
            Reviewed by darin
    
            * khtml/rendering/render_table.cpp:
            (RenderTableCell::calcMinMaxWidth):
            (RenderTableCell::setStyle):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3771 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 5d3164d..cfe2346 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2003-03-06  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3156125, regression on hiptop.com.  Caused by better
+	nowrap handling perversely enough.  Need another quirk from
+	Moz/WinIE to make this site behave.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTableCell::calcMinMaxWidth):
+        (RenderTableCell::setStyle):
+
 2003-03-06  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5d3164d..cfe2346 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2003-03-06  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3156125, regression on hiptop.com.  Caused by better
+	nowrap handling perversely enough.  Need another quirk from
+	Moz/WinIE to make this site behave.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTableCell::calcMinMaxWidth):
+        (RenderTableCell::setStyle):
+
 2003-03-06  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index 4e66243..aeca144 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -32,6 +32,7 @@
 #include "rendering/table_layout.h"
 #include "html/html_tableimpl.h"
 #include "misc/htmltags.h"
+#include "misc/htmlattrs.h"
 
 #include <kglobal.h>
 
@@ -42,6 +43,7 @@
 #include <assert.h>
 
 using namespace khtml;
+using namespace DOM;
 
 RenderTable::RenderTable(DOM::NodeImpl* node)
     : RenderBlock(node)
@@ -1394,14 +1396,18 @@ void RenderTableCell::setCellPercentageHeight(int h)
     
 void RenderTableCell::calcMinMaxWidth()
 {
-    KHTMLAssert( !minMaxKnown() );
-#ifdef DEBUG_LAYOUT
-    kdDebug( 6040 ) << renderName() << "(TableCell)::calcMinMaxWidth() known=" << minMaxKnown() << endl;
-#endif
-
     RenderBlock::calcMinMaxWidth();
-    
-    setMinMaxKnown();
+    if (element() && style()->whiteSpace() == NORMAL) {
+        // See if nowrap was set.
+        DOMString nowrap = static_cast<ElementImpl*>(element())->getAttribute(ATTR_NOWRAP);
+        if (!nowrap.isNull() && style()->width().isFixed())
+            // Nowrap is set, but we didn't actually use it because of the
+            // fixed width set on the cell.  Even so, it is a WinIE/Moz trait
+            // to make the minwidth of the cell into the fixed width.  They do this
+            // even in strict mode, so do not make this a quirk.  Affected the top
+            // of hiptop.com.
+            m_minWidth = style()->width().value;
+    }
 }
 
 void RenderTableCell::calcWidth()
@@ -1461,7 +1467,7 @@ void RenderTableCell::setStyle( RenderStyle *style )
     style->setDisplay(TABLE_CELL);
     RenderBlock::setStyle( style );
     setShouldPaintBackgroundOrBorder(true);
-    
+
     if (style->whiteSpace() == KONQ_NOWRAP) {
         // Figure out if we are really nowrapping or if we should just
         // use normal instead.  If the width of the cell is fixed, then

-- 
WebKit Debian packaging