Title: [197755] releases/WebKitGTK/webkit-2.12
- Revision
- 197755
- Author
- [email protected]
- Date
- 2016-03-08 04:21:28 -0800 (Tue, 08 Mar 2016)
Log Message
Merge r197486 - Paint table borders on empty cells even in quirks mode.
https://bugs.webkit.org/show_bug.cgi?id=154928
Reviewed by David Hyatt.
Enable border painting for empty cells unless 'empty-cells: hide' is set.
This is inline with FF and Chrome behaviour.
Source/WebCore:
Test: fast/table/border-on-empty-table-cells-quirks-mode.html
* rendering/RenderTableCell.cpp:
(WebCore::RenderTableCell::paintBoxDecorations):
LayoutTests:
* fast/table/border-on-empty-table-cells-quirks-mode-expected.html: Added.
* fast/table/border-on-empty-table-cells-quirks-mode.html: Added.
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (197754 => 197755)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-03-08 12:07:30 UTC (rev 197754)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-03-08 12:21:28 UTC (rev 197755)
@@ -1,3 +1,16 @@
+2016-03-02 Zalan Bujtas <[email protected]>
+
+ Paint table borders on empty cells even in quirks mode.
+ https://bugs.webkit.org/show_bug.cgi?id=154928
+
+ Reviewed by David Hyatt.
+
+ Enable border painting for empty cells unless 'empty-cells: hide' is set.
+ This is inline with FF and Chrome behaviour.
+
+ * fast/table/border-on-empty-table-cells-quirks-mode-expected.html: Added.
+ * fast/table/border-on-empty-table-cells-quirks-mode.html: Added.
+
2016-03-02 Brady Eidson <[email protected]>
Modern IDB: Close UniqueIDBDatabases once they become unused.
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/table/border-on-empty-table-cells-quirks-mode-expected.html (0 => 197755)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/table/border-on-empty-table-cells-quirks-mode-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/table/border-on-empty-table-cells-quirks-mode-expected.html 2016-03-08 12:21:28 UTC (rev 197755)
@@ -0,0 +1,20 @@
+<html>
+<head>
+<title>This tests that we paint borders on empty table cells even in quirks mode.</title>
+<style>
+div {
+ position: absolute;
+ border: 1px solid green;
+ height: 48px;
+ width: 52px;
+}
+</style>
+</head>
+<body>
+<div style="left: 10px; top: 10px"></div>
+<div style="left: 10px; top: 62px"></div>
+<div style="left: 10px; top: 168px"></div>
+<div style="left: 10px; top: 222px"></div>
+<div style="left: 10px; top: 274px"></div>
+</body>
+</html>
\ No newline at end of file
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/table/border-on-empty-table-cells-quirks-mode.html (0 => 197755)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/table/border-on-empty-table-cells-quirks-mode.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/table/border-on-empty-table-cells-quirks-mode.html 2016-03-08 12:21:28 UTC (rev 197755)
@@ -0,0 +1,17 @@
+<html>
+<head>
+<title>This tests that we paint borders on empty table cells even in quirks mode.</title>
+<style>
+td {
+ border: 1px solid green;
+ height: 50px;
+ width: 50px;
+}
+</style>
+</head>
+<body>
+ <table style="empty-cells: show"><tr><td></td></tr><tr><td> </td></tr></table>
+ <table style="empty-cells: hide"><tr><td></td></tr><tr><td> </td></tr></table>
+ <table><tr><td></td></tr><tr><td> </td></tr></table>
+</body>
+</html>
\ No newline at end of file
Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/table/table-cell-border-no-doctype-expected.html (197754 => 197755)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/table/table-cell-border-no-doctype-expected.html 2016-03-08 12:07:30 UTC (rev 197754)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/table/table-cell-border-no-doctype-expected.html 2016-03-08 12:21:28 UTC (rev 197755)
@@ -13,14 +13,14 @@
<table>
<tr>
<td width="50%" style=" border: 1px solid red;background-color: yellow;"><p></p></td>
- <td width="50%" style=" border: none"></td>
+ <td width="50%" style=" border: 1px solid red;"></td>
</tr>
</table>
</br>
<table>
<tr>
<td width="50%" style=" border: 1px solid red;background-color: yellow;"><p></p></td>
- <td width="50%" style=" border: none"></td>
+ <td width="50%" style=" border: 1px solid red;"></td>
</tr>
</table>
</body>
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (197754 => 197755)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-03-08 12:07:30 UTC (rev 197754)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-03-08 12:21:28 UTC (rev 197755)
@@ -1,3 +1,18 @@
+2016-03-02 Zalan Bujtas <[email protected]>
+
+ Paint table borders on empty cells even in quirks mode.
+ https://bugs.webkit.org/show_bug.cgi?id=154928
+
+ Reviewed by David Hyatt.
+
+ Enable border painting for empty cells unless 'empty-cells: hide' is set.
+ This is inline with FF and Chrome behaviour.
+
+ Test: fast/table/border-on-empty-table-cells-quirks-mode.html
+
+ * rendering/RenderTableCell.cpp:
+ (WebCore::RenderTableCell::paintBoxDecorations):
+
2016-03-02 Brady Eidson <[email protected]>
Modern IDB: Close UniqueIDBDatabases once they become unused.
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderTableCell.cpp (197754 => 197755)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderTableCell.cpp 2016-03-08 12:07:30 UTC (rev 197754)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderTableCell.cpp 2016-03-08 12:21:28 UTC (rev 197755)
@@ -1277,8 +1277,8 @@
if (!paintInfo.shouldPaintWithinRoot(*this))
return;
- RenderTable* tableElt = table();
- if (!tableElt->collapseBorders() && style().emptyCells() == HIDE && !firstChild())
+ RenderTable* table = this->table();
+ if (!table->collapseBorders() && style().emptyCells() == HIDE && !firstChild())
return;
LayoutRect paintRect = LayoutRect(paintOffset, frameRect().size());
@@ -1289,7 +1289,7 @@
paintBoxShadow(paintInfo, paintRect, style(), Inset);
- if (!style().hasBorder() || tableElt->collapseBorders() || (!firstChild() && document().inQuirksMode()))
+ if (!style().hasBorder() || table->collapseBorders())
return;
paintBorder(paintInfo, paintRect, style());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
