Title: [200726] branches/safari-601-branch
- Revision
- 200726
- Author
- matthew_han...@apple.com
- Date
- 2016-05-11 18:31:37 -0700 (Wed, 11 May 2016)
Log Message
Merge r190820. rdar://problem/26228566
Modified Paths
Added Paths
Diff
Modified: branches/safari-601-branch/LayoutTests/ChangeLog (200725 => 200726)
--- branches/safari-601-branch/LayoutTests/ChangeLog 2016-05-12 01:31:34 UTC (rev 200725)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2016-05-12 01:31:37 UTC (rev 200726)
@@ -1,5 +1,19 @@
2016-05-11 Matthew Hanson <matthew_han...@apple.com>
+ Merge r190820. rdar://problem/26228566
+
+ 2015-10-09 Simon Fraser <simon.fra...@apple.com>
+
+ Garbage texture data with composited table row
+ https://bugs.webkit.org/show_bug.cgi?id=148984
+
+ Reviewed by Zalan Bujtas.
+
+ * compositing/contents-opaque/table-parts-expected.txt: Added.
+ * compositing/contents-opaque/table-parts.html: Added.
+
+2016-05-11 Matthew Hanson <matthew_han...@apple.com>
+
Merge r200378. rdar://problem/26066673
2016-05-03 Chris Dumez <cdu...@apple.com>
Added: branches/safari-601-branch/LayoutTests/compositing/contents-opaque/table-parts-expected.txt (0 => 200726)
--- branches/safari-601-branch/LayoutTests/compositing/contents-opaque/table-parts-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/compositing/contents-opaque/table-parts-expected.txt 2016-05-12 01:31:37 UTC (rev 200726)
@@ -0,0 +1,25 @@
+Table cell
+Table cell
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 800.00 600.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 800.00 600.00)
+ (contentsOpaque 1)
+ (children 2
+ (GraphicsLayer
+ (position 28.00 20.00)
+ (bounds 252.00 102.00)
+ (drawsContent 1)
+ )
+ (GraphicsLayer
+ (position 28.00 142.00)
+ (bounds 252.00 102.00)
+ (drawsContent 1)
+ )
+ )
+ )
+ )
+)
+
Added: branches/safari-601-branch/LayoutTests/compositing/contents-opaque/table-parts.html (0 => 200726)
--- branches/safari-601-branch/LayoutTests/compositing/contents-opaque/table-parts.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/compositing/contents-opaque/table-parts.html 2016-05-12 01:31:37 UTC (rev 200726)
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+
+ table {
+ border-collapse: collapse;
+ margin: 20px;
+ }
+
+ tr {
+ background-color: silver;
+ border-right: 100px solid gray;
+ }
+
+ td {
+ width: 200px;
+ height: 100px;
+ }
+
+ .composited {
+ -webkit-transform: translateZ(0);
+ }
+
+ td.composited {
+ background-color: silver;
+ }
+ </style>
+ <script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ function doTest() {
+ if (window.testRunner && window.internals)
+ document.getElementById('layertree').innerText = window.internals.layerTreeAsText(document);
+ }
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+<table>
+ <tr class="composited">
+ <td>Table cell</td>
+ </tr>
+</table>
+
+<table>
+ <tr>
+ <td class="composited">Table cell</td>
+ </tr>
+</table>
+<pre id="layertree"></pre>
+</body>
+</html>
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (200725 => 200726)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-05-12 01:31:34 UTC (rev 200725)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-05-12 01:31:37 UTC (rev 200726)
@@ -1,5 +1,24 @@
2016-05-11 Matthew Hanson <matthew_han...@apple.com>
+ Merge r190820. rdar://problem/26228566
+
+ 2015-10-09 Simon Fraser <simon.fra...@apple.com>
+
+ Garbage texture data with composited table row
+ https://bugs.webkit.org/show_bug.cgi?id=148984
+
+ Reviewed by Zalan Bujtas.
+
+ Don't pretend to know if the layer for a table header, section or cell is
+ opaque, since table painting is special.
+
+ Test: compositing/contents-opaque/table-parts.html
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::backgroundIsKnownToBeOpaqueInRect):
+
+2016-05-11 Matthew Hanson <matthew_han...@apple.com>
+
Merge r200091. rdar://problem/26228555
2016-04-26 Brent Fulgham <bfulg...@apple.com>
Modified: branches/safari-601-branch/Source/WebCore/rendering/RenderLayer.cpp (200725 => 200726)
--- branches/safari-601-branch/Source/WebCore/rendering/RenderLayer.cpp 2016-05-12 01:31:34 UTC (rev 200725)
+++ branches/safari-601-branch/Source/WebCore/rendering/RenderLayer.cpp 2016-05-12 01:31:37 UTC (rev 200726)
@@ -6148,6 +6148,10 @@
if (m_zOrderListsDirty || m_normalFlowListDirty)
return false;
+ // Table painting is special; a table paints its sections.
+ if (renderer().isTablePart())
+ return false;
+
// FIXME: We currently only check the immediate renderer,
// which will miss many cases.
if (renderer().backgroundIsKnownToBeOpaqueInRect(localRect))
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
