[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[mitz at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit a46e06d21ef7b348fc5321d9f37532c6ac3199bd
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 10 21:02:40 2010 +0000

    Complete the fix for <rdar://problem/7577604> Drag and Drop: background elements are bleeding through
    https://bugs.webkit.org/show_bug.cgi?id=34546
    
    Reviewed by Dave Hyatt.
    
    * manual-tests/drag-image-table-part-decorations.html:
    * rendering/RenderTableCell.cpp:
    (WebCore::RenderTableCell::paint): Don’t paint collapsed borders if this object shouldn’t
    paint within the current painting root.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54615 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index dcdadd9..637c47a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-10  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        Complete the fix for <rdar://problem/7577604> Drag and Drop: background elements are bleeding through
+        https://bugs.webkit.org/show_bug.cgi?id=34546
+
+        * manual-tests/drag-image-table-part-decorations.html:
+        * rendering/RenderTableCell.cpp:
+        (WebCore::RenderTableCell::paint): Don’t paint collapsed borders if this object shouldn’t
+        paint within the current painting root.
+
 2010-02-08  Jon Honeycutt  <jhoneycutt at apple.com>
 
         <rdar://problem/7436875> Crash in Flash when visiting
diff --git a/WebCore/manual-tests/drag-image-table-part-decorations.html b/WebCore/manual-tests/drag-image-table-part-decorations.html
index 467cc54..28aa175 100644
--- a/WebCore/manual-tests/drag-image-table-part-decorations.html
+++ b/WebCore/manual-tests/drag-image-table-part-decorations.html
@@ -14,3 +14,6 @@
 
 <fieldset style="background-color: blue; border: none; height: 100px; width: 100px;"><legend></legend></fieldset>
 <div style="width: 94px; height: 94px; border: solid; -webkit-user-drag: element; margin-top: -50px; "></div>
+
+<table style="border-collapse: collapse;"><tr><td style="border-bottom: 100px solid blue; width: 100px;"></td></tr></table>
+<div style="width: 94px; height: 94px; border: solid; -webkit-user-drag: element; margin-top: -50px; "></div>
diff --git a/WebCore/rendering/RenderTableCell.cpp b/WebCore/rendering/RenderTableCell.cpp
index 8e55f84..bfa865f 100644
--- a/WebCore/rendering/RenderTableCell.cpp
+++ b/WebCore/rendering/RenderTableCell.cpp
@@ -629,6 +629,9 @@ int RenderTableCell::borderHalfBottom(bool outer) const
 void RenderTableCell::paint(PaintInfo& paintInfo, int tx, int ty)
 {
     if (paintInfo.phase == PaintPhaseCollapsedTableBorders && style()->visibility() == VISIBLE) {
+        if (!shouldPaintWithinRoot(paintInfo))
+            return;
+
         tx += x();
         ty += y();
         int os = 2 * maximalOutlineSize(paintInfo.phase);

-- 
WebKit Debian packaging