[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 89358fc4f63a1ef0896f0d3350807426281717d8
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 20 06:57:29 2003 +0000

    	Fix for a regression/crash on tivocommunity.com caused by faulty border-collapse code in the collapsedRightBorder
    	case.  I forgot to deal with colspans.
    
            Reviewed by darin
    
            * khtml/rendering/render_table.cpp:
            (RenderTable::cellRight):
            (RenderTableCell::collapsedRightBorder):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5219 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 309629c..a544e24 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
 2003-10-19  David Hyatt  <hyatt at apple.com>
 
+	Fix for a regression/crash on tivocommunity.com caused by faulty border-collapse code in the collapsedRightBorder
+	case.  I forgot to deal with colspans.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::cellRight):
+        (RenderTableCell::collapsedRightBorder):
+
+2003-10-19  David Hyatt  <hyatt at apple.com>
+
 	Patch from KHTML trunk that makes textareas work properly even when they have no render objects.
 
         * khtml/html/html_formimpl.cpp:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 309629c..a544e24 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2003-10-19  David Hyatt  <hyatt at apple.com>
 
+	Fix for a regression/crash on tivocommunity.com caused by faulty border-collapse code in the collapsedRightBorder
+	case.  I forgot to deal with colspans.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::cellRight):
+        (RenderTableCell::collapsedRightBorder):
+
+2003-10-19  David Hyatt  <hyatt at apple.com>
+
 	Patch from KHTML trunk that makes textareas work properly even when they have no render objects.
 
         * khtml/html/html_formimpl.cpp:
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index 6b5d74d..c01f36e 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -810,10 +810,11 @@ RenderTableCell* RenderTable::cellLeft(const RenderTableCell* cell) const
 
 RenderTableCell* RenderTable::cellRight(const RenderTableCell* cell) const
 {
-    int effCol = colToEffCol(cell->col());
+    int effCol = colToEffCol(cell->col()+cell->colSpan());
     if (effCol == numEffCols()-1)
         return 0;
-    return cell->section()->cellAt(cell->row(), effCol+1);
+    RenderTableCell* result = cell->section()->cellAt(cell->row(), effCol);
+    return (result == (RenderTableCell*)-1) ? 0 : result;
 }
 
 #ifndef NDEBUG
@@ -1800,7 +1801,7 @@ CollapsedBorderValue RenderTableCell::collapsedRightBorder() const
 {
     RenderTable* tableElt = table();
     bool inLastColumn = false;
-    int effCol = tableElt->colToEffCol(col());
+    int effCol = tableElt->colToEffCol(col()+colSpan()-1);
     if (effCol == tableElt->numEffCols()-1)
         inLastColumn = true;
     
@@ -1827,7 +1828,7 @@ CollapsedBorderValue RenderTableCell::collapsedRightBorder() const
     }
     
     // (5) Our column's right border.
-    RenderTableCol* colElt = table()->colElement(col());
+    RenderTableCol* colElt = table()->colElement(col()+colSpan()-1);
     if (colElt) {
         result = compareBorders(result, CollapsedBorderValue(&colElt->style()->borderRight(), BCOL));
         if (!result.exists()) return result;
@@ -1835,7 +1836,7 @@ CollapsedBorderValue RenderTableCell::collapsedRightBorder() const
     
     // (6) The next column's left border.
     if (!inLastColumn) {
-        colElt = tableElt->colElement(col()+1);
+        colElt = tableElt->colElement(col()+colSpan());
         if (colElt) {
             result = compareBorders(result, CollapsedBorderValue(&colElt->style()->borderLeft(), BCOL));
             if (!result.exists()) return result;

-- 
WebKit Debian packaging