[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 69dea555e62f6a8acec125af5a17e842c2ab4225
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 29 22:33:45 2003 +0000

    	Fix for 3425053, text past the bottom of a positioned table doesn't repaint.
    	3426847 is the same bug.  Both are fixed by ensuring that calcHeight doesn't actually
    	do anything other than margin computation and position determination for positioned
    	elements.  In reality, for weird edge cases like implying the height via explicit top and
    	bottom properties, we'll still be wrong.
    
            Reviewed by darin
    
            * ChangeLog:
            * khtml/rendering/render_table.cpp:
            (RenderTable::layout):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5080 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7b7ed84..2b5895d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,19 @@
 2003-09-29  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3425053, text past the bottom of a positioned table doesn't repaint.
+	3426847 is the same bug.  Both are fixed by ensuring that calcHeight doesn't actually
+	do anything other than margin computation and position determination for positioned
+	elements.  In reality, for weird edge cases like implying the height via explicit top and
+	bottom properties, we'll still be wrong.
+	
+        Reviewed by darin
+
+        * ChangeLog:
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::layout):
+
+2003-09-29  David Hyatt  <hyatt at apple.com>
+
 	Make sure that timeouts updateRendering after they execute the scheduled timer
 	action.  
 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7b7ed84..2b5895d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,19 @@
 2003-09-29  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3425053, text past the bottom of a positioned table doesn't repaint.
+	3426847 is the same bug.  Both are fixed by ensuring that calcHeight doesn't actually
+	do anything other than margin computation and position determination for positioned
+	elements.  In reality, for weird edge cases like implying the height via explicit top and
+	bottom properties, we'll still be wrong.
+	
+        Reviewed by darin
+
+        * ChangeLog:
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::layout):
+
+2003-09-29  David Hyatt  <hyatt at apple.com>
+
 	Make sure that timeouts updateRendering after they execute the scheduled timer
 	action.  
 
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index 32bd820..41ea98f 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -349,8 +349,17 @@ void RenderTable::layout()
 
     //kdDebug(0) << "table height: " << m_height << endl;
 
+    // FIXME: calcHeight should not affect height for tables.  In the positioned case,
+    // e.g., <table style="position:absolute">, it potentially does.  We're going to have to come up with a better
+    // solution eventually, but for now a good stopgap solution is to simply prevent this function
+    // from altering the height.
+    // 
+    // When the height is implicitly determined via, e.g., explicit top and bottom values in CSS, we're still
+    // going to be completely wrong.
+    int oldHeight = m_height;
     calcHeight();
-
+    m_height = oldHeight;
+        
     //kdDebug(0) << "table height: " << m_height << endl;
 
     // table can be containing block of positioned elements.

-- 
WebKit Debian packaging