[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 709889a2e65db4b03551f150090b557c149260e1
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 30 10:00:58 2002 +0000

    	Back myself out. I seem to have stumbled onto another bug.
    	Until I figure it out, turn this back off.
    
            * khtml/rendering/render_table.cpp:
            (RenderTable::addColumns):
            (RenderTable::addColInfo):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1696 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 3c449cb..1d45d80 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
 2002-07-30  David Hyatt  <hyatt at apple.com>
 
+	Back myself out. I seem to have stumbled onto another bug.
+	Until I figure it out, turn this back off.
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::addColumns):
+        (RenderTable::addColInfo):
+
+2002-07-30  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3000604, 2902173, 2921313.  Ensure that tables recalc their
 	column widths like they are supposed to.  This fixes livepage.apple.com,
 	applemuseum.com, and many other pages (that didn't have bugs filed).
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3c449cb..1d45d80 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
 2002-07-30  David Hyatt  <hyatt at apple.com>
 
+	Back myself out. I seem to have stumbled onto another bug.
+	Until I figure it out, turn this back off.
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::addColumns):
+        (RenderTable::addColInfo):
+
+2002-07-30  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3000604, 2902173, 2921313.  Ensure that tables recalc their
 	column widths like they are supposed to.  This fixes livepage.apple.com,
 	applemuseum.com, and many other pages (that didn't have bugs filed).
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3c449cb..1d45d80 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2002-07-30  David Hyatt  <hyatt at apple.com>
 
+	Back myself out. I seem to have stumbled onto another bug.
+	Until I figure it out, turn this back off.
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::addColumns):
+        (RenderTable::addColInfo):
+
+2002-07-30  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3000604, 2902173, 2921313.  Ensure that tables recalc their
 	column widths like they are supposed to.  This fixes livepage.apple.com,
 	applemuseum.com, and many other pages (that didn't have bugs filed).
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index 3bef72b..b7e9f27 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -541,9 +541,13 @@ void RenderTable::addColInfo(int _startCol, int _colSpan,
 	}
     }
     
+#ifndef APPLE_CHANGES
+    // I've uncovered a second bug.  Until I can figure this out,
+    // I have to keep this commented out.  -dwh
     if ( recalc )
         recalcColInfo( col );
-    
+#endif
+
     if ( changed )
 	setMinMaxKnown(false);
 

-- 
WebKit Debian packaging