[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 3c1544fd133ccaefbf0b82979fff04a3baf8a885
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 19 03:05:55 2002 +0000

    	Fix crazyapplerumors.com.  I had the logic backwards. CSS
    	padding beats cellpadding.
    
            * khtml/rendering/render_table.cpp:
            (RenderTableCell::paddingTop):
            (RenderTableCell::paddingBottom):
            (RenderTableCell::paddingLeft):
            (RenderTableCell::paddingRight):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2746 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index e8af295..0885880 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,16 @@
 2002-11-18  David Hyatt  <hyatt at apple.com>
 
+	Fix crazyapplerumors.com.  I had the logic backwards. CSS
+	padding beats cellpadding.
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTableCell::paddingTop):
+        (RenderTableCell::paddingBottom):
+        (RenderTableCell::paddingLeft):
+        (RenderTableCell::paddingRight):
+
+2002-11-18  David Hyatt  <hyatt at apple.com>
+
 	Fix crash on espn.com.
 	
         * khtml/rendering/render_object.cpp:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e8af295..0885880 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
 2002-11-18  David Hyatt  <hyatt at apple.com>
 
+	Fix crazyapplerumors.com.  I had the logic backwards. CSS
+	padding beats cellpadding.
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTableCell::paddingTop):
+        (RenderTableCell::paddingBottom):
+        (RenderTableCell::paddingLeft):
+        (RenderTableCell::paddingRight):
+
+2002-11-18  David Hyatt  <hyatt at apple.com>
+
 	Fix crash on espn.com.
 	
         * khtml/rendering/render_object.cpp:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e8af295..0885880 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2002-11-18  David Hyatt  <hyatt at apple.com>
 
+	Fix crazyapplerumors.com.  I had the logic backwards. CSS
+	padding beats cellpadding.
+	
+        * khtml/rendering/render_table.cpp:
+        (RenderTableCell::paddingTop):
+        (RenderTableCell::paddingBottom):
+        (RenderTableCell::paddingLeft):
+        (RenderTableCell::paddingRight):
+
+2002-11-18  David Hyatt  <hyatt at apple.com>
+
 	Fix crash on espn.com.
 	
         * khtml/rendering/render_object.cpp:
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index 536c62d..1fbd8ce 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -2141,30 +2141,38 @@ void RenderTableCell::close()
 
 int RenderTableCell::paddingTop() const
 {
+    if (style()->hasPadding())
+        return RenderFlow::paddingTop();
     if (m_table && m_table->cellPadding() != -1)
         return m_table->cellPadding();
-    return RenderFlow::paddingTop();
+    return 0;
 }
 
 int RenderTableCell::paddingBottom() const
 {
+    if (style()->hasPadding())
+        return RenderFlow::paddingBottom();
     if (m_table && m_table->cellPadding() != -1)
         return m_table->cellPadding();
-    return RenderFlow::paddingBottom();
+    return 0;
 }
 
 int RenderTableCell::paddingLeft() const
 {
+    if (style()->hasPadding())
+        return RenderFlow::paddingLeft();
     if (m_table && m_table->cellPadding() != -1)
         return m_table->cellPadding();
-    return RenderFlow::paddingLeft();
+    return 0;
 }
 
 int RenderTableCell::paddingRight() const
 {
+    if (style()->hasPadding())
+        return RenderFlow::paddingRight();
     if (m_table && m_table->cellPadding() != -1)
         return m_table->cellPadding();
-    return RenderFlow::paddingRight();
+    return 0;
 }
 
 void RenderTableCell::repaintRectangle(int x, int y, int w, int h, bool immediate, bool f)

-- 
WebKit Debian packaging