[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 9a3e481917fcf398edc2b763c7b294b53fc007ec
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 20 19:55:32 2002 +0000

    	Fix background positioning so that it works with table cells.
    	This fixes the tabs on www.msn.com.
    
            * khtml/rendering/render_box.cpp:
            (RenderBox::printBackground):
            * khtml/rendering/render_table.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1879 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 63e8813..5d8779e 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-08-20  David Hyatt  <hyatt at apple.com>
+
+	Fix background positioning so that it works with table cells.
+	This fixes the tabs on www.msn.com.
+	
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::printBackground):
+        * khtml/rendering/render_table.h:
+
 2002-08-20  Darin Adler  <darin at apple.com>
 
 	WebCore part of support for tabbing into and out of the toolbar.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 63e8813..5d8779e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-08-20  David Hyatt  <hyatt at apple.com>
+
+	Fix background positioning so that it works with table cells.
+	This fixes the tabs on www.msn.com.
+	
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::printBackground):
+        * khtml/rendering/render_table.h:
+
 2002-08-20  Darin Adler  <darin at apple.com>
 
 	WebCore part of support for tabbing into and out of the toolbar.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 63e8813..5d8779e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2002-08-20  David Hyatt  <hyatt at apple.com>
+
+	Fix background positioning so that it works with table cells.
+	This fixes the tabs on www.msn.com.
+	
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::printBackground):
+        * khtml/rendering/render_table.h:
+
 2002-08-20  Darin Adler  <darin at apple.com>
 
 	WebCore part of support for tabbing into and out of the toolbar.
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index 8ddb3e5..943be95 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -198,7 +198,17 @@ void RenderBox::printBackground(QPainter *p, const QColor &c, CachedImage *bg, i
         {
             //scroll
             int pw = m_width - vpab;
-            int ph = m_height - hpab;
+            int h = m_height;
+            if (isTableCell()) {
+                // Table cells' m_height variable is wrong.  You have to take into
+                // account this hack extra stuff to get the right height. 
+                // Otherwise using background-position: bottom won't work in
+                // a table cell that has the extra height. -dwh
+                RenderTableCell* tableCell = static_cast<RenderTableCell*>(this);
+                h += tableCell->borderTopExtra() + tableCell->borderBottomExtra();
+            }
+            int ph = h - hpab;
+            
             int pixw = bg->pixmap_size().width();
             int pixh = bg->pixmap_size().height();
             EBackgroundRepeat bgr = sptr->backgroundRepeat();
diff --git a/WebCore/khtml/rendering/render_table.h b/WebCore/khtml/rendering/render_table.h
index 11da9fb..8011378 100644
--- a/WebCore/khtml/rendering/render_table.h
+++ b/WebCore/khtml/rendering/render_table.h
@@ -404,6 +404,9 @@ public:
 
     virtual short baselinePosition( bool = false ) const;
 
+    virtual int borderTopExtra() { return _topExtra; }
+    virtual int borderBottomExtra() { return _bottomExtra; }
+
 #ifndef NDEBUG
     virtual void dump(QTextStream *stream, QString ind = "") const;
 #endif
@@ -432,10 +435,6 @@ protected:
     bool nWrap : 1;
     bool m_widthChanged : 1;
 
-    virtual int borderTopExtra() { return _topExtra; }
-    virtual int borderBottomExtra() { return _bottomExtra; }
-
-
     RenderTableRow *rowimpl;
 };
 

-- 
WebKit Debian packaging