[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 97aad047503ff365656dcb5efa1d4d36987c8244
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 26 22:27:29 2002 +0000

    	Fix for 2944382, NOWRAP was being incorrectly applied in KHTML.
    	It was being ignored incorrectly if a fixed width was specified
    	on a cell.  This width on the cell is actually irrelevant and
    	should not have been checked, since NOWRAP will affect the
    	whole column and not just a specific cell.
    
            * khtml/rendering/render_table.cpp:
            (RenderTableCell::calcMinMaxWidth):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1682 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 6b3eb86..90511bf 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-07-26  David Hyatt  <hyatt at apple.com>
+
+	Fix for 2944382, NOWRAP was being incorrectly applied in KHTML.
+	It was being ignored incorrectly if a fixed width was specified
+	on a cell.  This width on the cell is actually irrelevant and
+	should not have been checked, since NOWRAP will affect the
+	whole column and not just a specific cell.
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTableCell::calcMinMaxWidth):
+
 2002-07-25  Darin Adler  <darin at apple.com>
 
         * WebCore.pbproj/project.pbxproj: Add DeploymentFat build style.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 6b3eb86..90511bf 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2002-07-26  David Hyatt  <hyatt at apple.com>
+
+	Fix for 2944382, NOWRAP was being incorrectly applied in KHTML.
+	It was being ignored incorrectly if a fixed width was specified
+	on a cell.  This width on the cell is actually irrelevant and
+	should not have been checked, since NOWRAP will affect the
+	whole column and not just a specific cell.
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTableCell::calcMinMaxWidth):
+
 2002-07-25  Darin Adler  <darin at apple.com>
 
         * WebCore.pbproj/project.pbxproj: Add DeploymentFat build style.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6b3eb86..90511bf 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2002-07-26  David Hyatt  <hyatt at apple.com>
+
+	Fix for 2944382, NOWRAP was being incorrectly applied in KHTML.
+	It was being ignored incorrectly if a fixed width was specified
+	on a cell.  This width on the cell is actually irrelevant and
+	should not have been checked, since NOWRAP will affect the
+	whole column and not just a specific cell.
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTableCell::calcMinMaxWidth):
+
 2002-07-25  Darin Adler  <darin at apple.com>
 
         * WebCore.pbproj/project.pbxproj: Add DeploymentFat build style.
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index bb6de21..b998acf 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -2031,9 +2031,20 @@ void RenderTableCell::calcMinMaxWidth()
 
     RenderFlow::calcMinMaxWidth();
 
-    if(nWrap && !(style()->width().type==Fixed))
+    // NOWRAP Should apply even in cases where the width is fixed.  Consider the following 
+    // test case.
+    // <table border="1">
+    // <tr>
+    // <td width="175">Check this text out. It shouldn't shrink below 300px.</td>
+    // <td width="100%"></td>
+    // </tr>
+    // <tr><td width="300" nowrap></tr>
+    // </table>
+    // The width of the cell should not be allowed to fall below the max width of the column when
+    // nowrap is enabled on any cell in the column.  - dwh
+    if(nWrap)
         m_minWidth = m_maxWidth;
-
+    
     if (m_minWidth!=oldMin || m_maxWidth!=oldMax) {
         m_table->addColInfo(this);
     }

-- 
WebKit Debian packaging