Title: [185186] trunk
- Revision
- 185186
- Author
- simon.fra...@apple.com
- Date
- 2015-06-03 21:42:52 -0700 (Wed, 03 Jun 2015)
Log Message
Layer tree dumps should include mask layers
https://bugs.webkit.org/show_bug.cgi?id=145629
Reviewed by Zalan Bujtas.
Source/WebCore:
Dumping the layer tree omitted to dump the mask layer, so fix
GraphicsLayer::dumpProperties() to dump this layer.
* platform/graphics/GraphicsLayer.cpp:
(WebCore::GraphicsLayer::dumpProperties):
LayoutTests:
New results.
* compositing/masks/compositing-clip-path-change-no-repaint-expected.txt:
* compositing/masks/mask-layer-size-expected.txt:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (185185 => 185186)
--- trunk/LayoutTests/ChangeLog 2015-06-04 04:19:51 UTC (rev 185185)
+++ trunk/LayoutTests/ChangeLog 2015-06-04 04:42:52 UTC (rev 185186)
@@ -1,3 +1,15 @@
+2015-06-03 Simon Fraser <simon.fra...@apple.com>
+
+ Layer tree dumps should include mask layers
+ https://bugs.webkit.org/show_bug.cgi?id=145629
+
+ Reviewed by Zalan Bujtas.
+
+ New results.
+
+ * compositing/masks/compositing-clip-path-change-no-repaint-expected.txt:
+ * compositing/masks/mask-layer-size-expected.txt:
+
2015-06-03 Greg Hughes <ghug...@apple.com>
AX: Expose field sets to accessibility clients
Modified: trunk/LayoutTests/compositing/masks/compositing-clip-path-change-no-repaint-expected.txt (185185 => 185186)
--- trunk/LayoutTests/compositing/masks/compositing-clip-path-change-no-repaint-expected.txt 2015-06-04 04:19:51 UTC (rev 185185)
+++ trunk/LayoutTests/compositing/masks/compositing-clip-path-change-no-repaint-expected.txt 2015-06-04 04:42:52 UTC (rev 185186)
@@ -14,11 +14,20 @@
(position 8.00 8.00)
(bounds 300.00 300.00)
(drawsContent 1)
+ (mask layer)
+ (GraphicsLayer
+ (bounds 300.00 300.00)
+ )
)
(GraphicsLayer
(position 8.00 308.00)
(bounds 300.00 300.00)
(drawsContent 1)
+ (mask layer)
+ (GraphicsLayer
+ (bounds 300.00 300.00)
+ (drawsContent 1)
+ )
(repaint rects
(rect 0.00 0.00 300.00 300.00)
)
Modified: trunk/LayoutTests/compositing/masks/mask-layer-size-expected.txt (185185 => 185186)
--- trunk/LayoutTests/compositing/masks/mask-layer-size-expected.txt 2015-06-04 04:19:51 UTC (rev 185185)
+++ trunk/LayoutTests/compositing/masks/mask-layer-size-expected.txt 2015-06-04 04:42:52 UTC (rev 185186)
@@ -10,6 +10,11 @@
(position 10.00 10.00)
(bounds 400.00 200.00)
(contentsOpaque 1)
+ (mask layer)
+ (GraphicsLayer
+ (bounds 400.00 200.00)
+ (drawsContent 1)
+ )
)
)
)
Modified: trunk/Source/WebCore/ChangeLog (185185 => 185186)
--- trunk/Source/WebCore/ChangeLog 2015-06-04 04:19:51 UTC (rev 185185)
+++ trunk/Source/WebCore/ChangeLog 2015-06-04 04:42:52 UTC (rev 185186)
@@ -1,3 +1,16 @@
+2015-06-03 Simon Fraser <simon.fra...@apple.com>
+
+ Layer tree dumps should include mask layers
+ https://bugs.webkit.org/show_bug.cgi?id=145629
+
+ Reviewed by Zalan Bujtas.
+
+ Dumping the layer tree omitted to dump the mask layer, so fix
+ GraphicsLayer::dumpProperties() to dump this layer.
+
+ * platform/graphics/GraphicsLayer.cpp:
+ (WebCore::GraphicsLayer::dumpProperties):
+
2015-06-03 Greg Hughes <ghug...@apple.com>
AX: Expose field sets to accessibility clients
Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp (185185 => 185186)
--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2015-06-04 04:19:51 UTC (rev 185185)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2015-06-04 04:42:52 UTC (rev 185186)
@@ -781,6 +781,15 @@
ts << "[" << m_childrenTransform.m41() << " " << m_childrenTransform.m42() << " " << m_childrenTransform.m43() << " " << m_childrenTransform.m44() << "])\n";
}
+ if (m_maskLayer) {
+ writeIndent(ts, indent + 1);
+ ts << "(mask layer";
+ if (behavior & LayerTreeAsTextDebug)
+ ts << " " << m_maskLayer;
+ ts << ")\n";
+ m_maskLayer->dumpLayer(ts, indent + 2, behavior);
+ }
+
if (m_replicaLayer) {
writeIndent(ts, indent + 1);
ts << "(replica layer";
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
