[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 46bc683ce8c8b6b93a6c5ccd45ce15696b0bfa76
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 29 23:21:28 2003 +0000

    	Fix for tables.  They weren't initializing their max top/bottom
    	values for margin collapsing, so their margins were being
    	ignored!
    
            Reviewed by darin
    
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::layout):
            * khtml/rendering/render_flow.h:
            * khtml/rendering/render_table.cpp:
            (RenderTable::layout):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3495 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b28f992..2e0aa11 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,19 @@
 2003-01-29  David Hyatt  <hyatt at apple.com>
 
+	Fix for tables.  They weren't initializing their max top/bottom
+	values for margin collapsing, so their margins were being
+	ignored!
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layout):
+        * khtml/rendering/render_flow.h:
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::layout):
+
+2003-01-29  David Hyatt  <hyatt at apple.com>
+
 	Back out my removal of the layer optimization.  The rest of
 	the code is not prepared to deal with child elements overriding
 	visibility, or with invisible layers sitting on top of
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b28f992..2e0aa11 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,19 @@
 2003-01-29  David Hyatt  <hyatt at apple.com>
 
+	Fix for tables.  They weren't initializing their max top/bottom
+	values for margin collapsing, so their margins were being
+	ignored!
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layout):
+        * khtml/rendering/render_flow.h:
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::layout):
+
+2003-01-29  David Hyatt  <hyatt at apple.com>
+
 	Back out my removal of the layer optimization.  The rest of
 	the code is not prepared to deal with child elements overriding
 	visibility, or with invisible layers sitting on top of
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 716ee6e..0e913e4 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -300,14 +300,7 @@ void RenderFlow::layout()
     // Start out by setting our margin values to our current margins.  Table cells have
     // no margins, so we don't fill in the values for table cells.
     if (!isTableCell()) {
-        if (m_marginTop >= 0)
-            m_maxTopPosMargin = m_marginTop;
-        else
-            m_maxTopNegMargin = -m_marginTop;
-        if (m_marginBottom >= 0)
-            m_maxBottomPosMargin = m_marginBottom;
-        else
-            m_maxBottomNegMargin = -m_marginBottom;
+        initMaxMarginValues();
             
         m_topMarginQuirk = style()->marginTop().quirk;
         m_bottomMarginQuirk = style()->marginBottom().quirk;
diff --git a/WebCore/khtml/rendering/render_flow.h b/WebCore/khtml/rendering/render_flow.h
index 1635ef9..91256a2 100644
--- a/WebCore/khtml/rendering/render_flow.h
+++ b/WebCore/khtml/rendering/render_flow.h
@@ -195,6 +195,17 @@ public:
             return m_maxBottomNegMargin;
     }
 
+    void initMaxMarginValues() {
+        if (m_marginTop >= 0)
+            m_maxTopPosMargin = m_marginTop;
+        else
+            m_maxTopNegMargin = -m_marginTop;
+        if (m_marginBottom >= 0)
+            m_maxBottomPosMargin = m_marginBottom;
+        else
+            m_maxBottomNegMargin = -m_marginBottom;
+    }
+    
 protected:
 
     struct SpecialObject {
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index 92b4961..b2f161e 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -239,7 +239,8 @@ void RenderTable::layout()
     //kdDebug( 6040 ) << renderName() << "(Table)"<< this << " ::layout0() width=" << width() << ", layouted=" << layouted() << endl;
 
     m_height = 0;
-
+    initMaxMarginValues();
+    
     //int oldWidth = m_width;
     calcWidth();
 

-- 
WebKit Debian packaging