[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

Sat Sep 26 06:31:17 UTC 2009

The following commit has been merged in the debian/unstable branch:
commit cf8ba526c25e56794acbd1c9cac447c650828ed5
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 14 22:30:41 2002 +0000

    	ROFL. The KHTML table code had a hardcoded "20" being
    	subtracted out of table heights instead of using the
    	actual margins on the <body> element.  This patch
    	removes the hardcoded "20" and replaces it with the
    	actual <body> margins.
    
            * khtml/rendering/render_table.cpp:
            (RenderTable::layoutRows):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1819 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 8748104..0085056 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,16 @@
 2002-08-14  David Hyatt  <hyatt at apple.com>
 
+	ROFL. The KHTML table code had a hardcoded "20" being
+	subtracted out of table heights instead of using the
+	actual margins on the <body> element.  This patch
+	removes the hardcoded "20" and replaces it with the
+	actual <body> margins.
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::layoutRows):
+
+2002-08-14  David Hyatt  <hyatt at apple.com>
+
 	Fix marginwidth and marginheight on the <body> element.
 	These attributes were not applying the correct margins,
 	which would cause many many pages to mis-render!
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 8748104..0085056 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
 2002-08-14  David Hyatt  <hyatt at apple.com>
 
+	ROFL. The KHTML table code had a hardcoded "20" being
+	subtracted out of table heights instead of using the
+	actual margins on the <body> element.  This patch
+	removes the hardcoded "20" and replaces it with the
+	actual <body> margins.
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::layoutRows):
+
+2002-08-14  David Hyatt  <hyatt at apple.com>
+
 	Fix marginwidth and marginheight on the <body> element.
 	These attributes were not applying the correct margins,
 	which would cause many many pages to mis-render!
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8748104..0085056 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2002-08-14  David Hyatt  <hyatt at apple.com>
 
+	ROFL. The KHTML table code had a hardcoded "20" being
+	subtracted out of table heights instead of using the
+	actual margins on the <body> element.  This patch
+	removes the hardcoded "20" and replaces it with the
+	actual <body> margins.
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::layoutRows):
+
+2002-08-14  David Hyatt  <hyatt at apple.com>
+
 	Fix marginwidth and marginheight on the <body> element.
 	These attributes were not applying the correct margins,
 	which would cause many many pages to mis-render!
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index 3c1f8e3..3c48d8b 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -1444,8 +1444,10 @@ void RenderTable::layoutRows(int yoff)
             if (!ro)
             {
 		// we need to substract the bodys margins
-		// ### fixme: use exact values here.
-                th = h.width(viewRect().height() - 20 );
+		// The cb is the <body>. Subtract out its margins. -dwh
+                th = h.width(viewRect().height() 
+			     - containingBlock()->marginBottom()
+			     - containingBlock()->marginTop());
                 // not really, but this way the view height change
                 // gets propagated correctly
                 setOverhangingContents();

-- 
WebKit Debian packaging

