REGRESSION (r154622): Borders disappear when hovering over cells in table
authorbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 2 Jun 2014 16:37:45 +0000 (16:37 +0000)
committerbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 2 Jun 2014 16:37:45 +0000 (16:37 +0000)
https://bugs.webkit.org/show_bug.cgi?id=133057
<rdar://problem/15922359>

Reviewed by Tim Horton.

Source/WebCore:
* rendering/RenderTableCell.cpp:
(WebCore::RenderTableCell::paintCollapsedBorders): Revert recent
non-edge collapsed border optimization due to drawing
regressions.

LayoutTests:
* TestExpectations: Mark the test we added in r154622 as failing
until we provide a permanent fix.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@169532 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/TestExpectations
Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderTableCell.cpp

index 681f4ef..3886193 100644 (file)
@@ -1,3 +1,14 @@
+2014-05-31  Brent Fulgham  <bfulgham@apple.com>
+
+        REGRESSION (r154622): Borders disappear when hovering over cells in table
+        https://bugs.webkit.org/show_bug.cgi?id=133057
+        <rdar://problem/15922359>
+
+        Reviewed by Tim Horton.
+
+        * TestExpectations: Mark the test we added in r154622 as failing
+        until we provide a permanent fix.
+
 2014-06-02  Kiran  <kiran.guduru@samsung.com>
 
         Add mock DTMFSender support.
index cc74093..29ab033 100644 (file)
@@ -123,3 +123,5 @@ webkit.org/b/132791 svg/as-object/sizing/svg-in-object-placeholder-height-percen
 webkit.org/b/132791 svg/as-object/sizing/svg-in-object-placeholder-height-auto.html [ Skip ]
 
 webkit.org/b/133356 js/primitive-property-access-edge-cases.html [ Pass Crash ]
+
+webkit.org/b/133057 fast/table/border-collapsing/collapsed-borders-adjoining-sections.html [ Failure ]
index 5fb023a..47c8104 100644 (file)
@@ -1,3 +1,16 @@
+2014-05-31  Brent Fulgham  <bfulgham@apple.com>
+
+        REGRESSION (r154622): Borders disappear when hovering over cells in table
+        https://bugs.webkit.org/show_bug.cgi?id=133057
+        <rdar://problem/15922359>
+
+        Reviewed by Tim Horton.
+
+        * rendering/RenderTableCell.cpp:
+        (WebCore::RenderTableCell::paintCollapsedBorders): Revert recent
+        non-edge collapsed border optimization due to drawing
+        regressions.
+
 2014-06-02  Zalan Bujtas  <zalan@apple.com>
 
         Provide better encapsulation for image related painting properties.
index beef5da..198e3a7 100644 (file)
@@ -1203,14 +1203,12 @@ void RenderTableCell::paintCollapsedBorders(PaintInfo& paintInfo, const LayoutPo
     int bottomYOffsetLeft = bottomWidth;
     int bottomYOffsetRight = bottomWidth;
 
-    // We use the direction/writing-mode given by the section here because we want to know if we're
-    // at the section's edge.
-    bool shouldDrawTopBorder = !cellAtTop(&section()->style());
-    bool shouldDrawLeftBorder = !cellAtLeft(&section()->style());
+    bool shouldDrawTopBorder = true;
+    bool shouldDrawLeftBorder = true;
     bool shouldDrawRightBorder = true;
 
     if (RenderTableCell* top = cellAtTop(&styleForCellFlow)) {
-        shouldDrawTopBorder = shouldDrawTopBorder && top->alignLeftRightBorderPaintRect(leftXOffsetTop, rightXOffsetTop);
+        shouldDrawTopBorder = top->alignLeftRightBorderPaintRect(leftXOffsetTop, rightXOffsetTop);
         if (this->colSpan() > 1)
             shouldDrawTopBorder = false;
     }
@@ -1219,7 +1217,7 @@ void RenderTableCell::paintCollapsedBorders(PaintInfo& paintInfo, const LayoutPo
         bottom->alignLeftRightBorderPaintRect(leftXOffsetBottom, rightXOffsetBottom);
 
     if (RenderTableCell* left = cellAtLeft(&styleForCellFlow))
-        shouldDrawLeftBorder = shouldDrawLeftBorder && left->alignTopBottomBorderPaintRect(topYOffsetLeft, bottomYOffsetLeft);
+        shouldDrawLeftBorder = left->alignTopBottomBorderPaintRect(topYOffsetLeft, bottomYOffsetLeft);
 
     if (RenderTableCell* right = cellAtRight(&styleForCellFlow))
         shouldDrawRightBorder = right->alignTopBottomBorderPaintRect(topYOffsetRight, bottomYOffsetRight);