Diff
Modified: trunk/LayoutTests/ChangeLog (246470 => 246471)
--- trunk/LayoutTests/ChangeLog 2019-06-16 04:47:05 UTC (rev 246470)
+++ trunk/LayoutTests/ChangeLog 2019-06-16 05:33:28 UTC (rev 246471)
@@ -1,3 +1,16 @@
+2019-06-15 Simon Fraser <[email protected]>
+
+ Make layerTreeAsText() output a bit less verbose
+ https://bugs.webkit.org/show_bug.cgi?id=198870
+
+ Reviewed by Tim Horton.
+
+ * compositing/overflow/stacking-context-composited-scroller-with-foreground-paint-phases-expected.txt:
+ * platform/gtk/compositing/overflow/composited-scrolling-paint-phases-expected.txt:
+ * platform/ios-wk2/compositing/overflow/stacking-context-composited-scroller-with-foreground-paint-phases-expected.txt:
+ * platform/mac-wk1/compositing/overflow/stacking-context-composited-scroller-with-foreground-paint-phases-expected.txt:
+ * platform/mac/compositing/overflow/composited-scrolling-paint-phases-expected.txt: Removed.
+
2019-06-15 Rob Buis <[email protected]>
Add tests for prefetch redirects
Modified: trunk/LayoutTests/compositing/overflow/stacking-context-composited-scroller-with-foreground-paint-phases-expected.txt (246470 => 246471)
--- trunk/LayoutTests/compositing/overflow/stacking-context-composited-scroller-with-foreground-paint-phases-expected.txt 2019-06-16 04:47:05 UTC (rev 246470)
+++ trunk/LayoutTests/compositing/overflow/stacking-context-composited-scroller-with-foreground-paint-phases-expected.txt 2019-06-16 05:33:28 UTC (rev 246471)
@@ -2,27 +2,18 @@
(GraphicsLayer
(anchor 0.00 0.00)
(bounds 800.00 600.00)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintForeground
- )
+ (paintingPhases [background, foreground])
(children 1
(GraphicsLayer
(bounds 800.00 600.00)
(contentsOpaque 1)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintForeground
- )
+ (paintingPhases [background, foreground])
(children 1
(GraphicsLayer
(position 8.00 8.00)
(bounds 322.00 322.00)
(drawsContent 1)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintCompositedScroll
- )
+ (paintingPhases [background, composited-scroll])
(children 1
(GraphicsLayer
(offsetFromRenderer width=1 height=1)
@@ -34,28 +25,19 @@
(anchor 0.00 0.00)
(bounds 305.00 1020.00)
(drawsContent 1)
- (paintingPhases
- GraphicsLayerPaintOverflowContents
- GraphicsLayerPaintCompositedScroll
- )
+ (paintingPhases [overflow-contents, composited-scroll])
(children 2
(GraphicsLayer
(position 30.00 50.00)
(bounds 100.00 100.00)
(contentsOpaque 1)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintForeground
- )
+ (paintingPhases [background, foreground])
)
(GraphicsLayer
(offsetFromRenderer width=1 height=1)
(bounds 305.00 1020.00)
(drawsContent 1)
- (paintingPhases
- GraphicsLayerPaintForeground
- GraphicsLayerPaintOverflowContents
- )
+ (paintingPhases [foreground, overflow-contents])
)
)
)
Modified: trunk/LayoutTests/platform/gtk/compositing/overflow/composited-scrolling-paint-phases-expected.txt (246470 => 246471)
--- trunk/LayoutTests/platform/gtk/compositing/overflow/composited-scrolling-paint-phases-expected.txt 2019-06-16 04:47:05 UTC (rev 246470)
+++ trunk/LayoutTests/platform/gtk/compositing/overflow/composited-scrolling-paint-phases-expected.txt 2019-06-16 05:33:28 UTC (rev 246471)
@@ -1,62 +1,42 @@
(GraphicsLayer
(anchor 0.00 0.00)
(bounds 800.00 600.00)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintForeground
- )
+ (paintingPhases [background, foreground])
(children 1
(GraphicsLayer
(bounds 800.00 600.00)
(contentsOpaque 1)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintForeground
- )
+ (paintingPhases [background, foreground])
(children 1
(GraphicsLayer
(position 28.00 20.00)
(bounds 202.00 202.00)
(drawsContent 1)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintCompositedScroll
- )
+ (paintingPhases [background, foreground])
(children 4
(GraphicsLayer
(offsetFromRenderer width=-1 height=-1)
(position 1.00 1.00)
(bounds 185.00 185.00)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintForeground
- )
+ (paintingPhases [background, foreground])
(children 1
(GraphicsLayer
(offsetFromRenderer width=1 height=1)
(bounds 185.00 715.00)
(drawsContent 1)
- (paintingPhases
- GraphicsLayerPaintOverflowContents
- GraphicsLayerPaintCompositedScroll
- )
+ (paintingPhases [overflow-contents, composited-scroll])
(children 2
(GraphicsLayer
(position 0.00 10.00)
(bounds 80.00 10.00)
(contentsOpaque 1)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintForeground
- )
+ (paintingPhases [background, foreground])
)
(GraphicsLayer
(offsetFromRenderer width=1 height=1)
(bounds 185.00 715.00)
(drawsContent 1)
- (paintingPhases
- GraphicsLayerPaintForeground
- )
+ (paintingPhases [foreground])
)
)
)
@@ -66,28 +46,19 @@
(position 1.00 186.00)
(bounds 185.00 15.00)
(drawsContent 1)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintForeground
- )
+ (paintingPhases [background, foreground])
)
(GraphicsLayer
(position 186.00 1.00)
(bounds 15.00 185.00)
(drawsContent 1)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintForeground
- )
+ (paintingPhases [background, foreground])
)
(GraphicsLayer
(position 186.00 186.00)
(bounds 15.00 15.00)
(drawsContent 1)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintForeground
- )
+ (paintingPhases [background, foreground])
)
)
)
Modified: trunk/LayoutTests/platform/ios-wk2/compositing/overflow/stacking-context-composited-scroller-with-foreground-paint-phases-expected.txt (246470 => 246471)
--- trunk/LayoutTests/platform/ios-wk2/compositing/overflow/stacking-context-composited-scroller-with-foreground-paint-phases-expected.txt 2019-06-16 04:47:05 UTC (rev 246470)
+++ trunk/LayoutTests/platform/ios-wk2/compositing/overflow/stacking-context-composited-scroller-with-foreground-paint-phases-expected.txt 2019-06-16 05:33:28 UTC (rev 246471)
@@ -2,27 +2,18 @@
(GraphicsLayer
(anchor 0.00 0.00)
(bounds 800.00 600.00)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintForeground
- )
+ (paintingPhases [background, foreground])
(children 1
(GraphicsLayer
(bounds 800.00 600.00)
(contentsOpaque 1)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintForeground
- )
+ (paintingPhases [background, foreground])
(children 1
(GraphicsLayer
(position 8.00 8.00)
(bounds 322.00 322.00)
(drawsContent 1)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintCompositedScroll
- )
+ (paintingPhases [background, composited-scroll])
(children 1
(GraphicsLayer
(offsetFromRenderer width=1 height=1)
@@ -34,28 +25,19 @@
(anchor 0.00 0.00)
(bounds 320.00 1020.00)
(drawsContent 1)
- (paintingPhases
- GraphicsLayerPaintOverflowContents
- GraphicsLayerPaintCompositedScroll
- )
+ (paintingPhases [overflow-contents, composited-scroll])
(children 2
(GraphicsLayer
(position 30.00 50.00)
(bounds 100.00 100.00)
(contentsOpaque 1)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintForeground
- )
+ (paintingPhases [background, foreground])
)
(GraphicsLayer
(offsetFromRenderer width=1 height=1)
(bounds 320.00 1020.00)
(drawsContent 1)
- (paintingPhases
- GraphicsLayerPaintForeground
- GraphicsLayerPaintOverflowContents
- )
+ (paintingPhases [foreground, overflow-contents])
)
)
)
Deleted: trunk/LayoutTests/platform/mac/compositing/overflow/composited-scrolling-paint-phases-expected.txt (246470 => 246471)
--- trunk/LayoutTests/platform/mac/compositing/overflow/composited-scrolling-paint-phases-expected.txt 2019-06-16 04:47:05 UTC (rev 246470)
+++ trunk/LayoutTests/platform/mac/compositing/overflow/composited-scrolling-paint-phases-expected.txt 2019-06-16 05:33:28 UTC (rev 246471)
@@ -1,99 +0,0 @@
-(GraphicsLayer
- (anchor 0.00 0.00)
- (bounds 800.00 600.00)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintForeground
- )
- (children 1
- (GraphicsLayer
- (bounds 800.00 600.00)
- (contentsOpaque 1)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintForeground
- )
- (children 1
- (GraphicsLayer
- (position 28.00 20.00)
- (bounds 202.00 202.00)
- (drawsContent 1)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintCompositedScroll
- )
- (children 4
- (GraphicsLayer
- (offsetFromRenderer width=-1 height=-1)
- (position 1.00 1.00)
- (bounds 185.00 185.00)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintForeground
- )
- (children 1
- (GraphicsLayer
- (offsetFromRenderer width=1 height=1)
- (bounds 185.00 715.00)
- (drawsContent 1)
- (paintingPhases
- GraphicsLayerPaintOverflowContents
- GraphicsLayerPaintCompositedScroll
- )
- (children 2
- (GraphicsLayer
- (position 0.00 10.00)
- (bounds 80.00 10.00)
- (contentsOpaque 1)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintForeground
- )
- )
- (GraphicsLayer
- (offsetFromRenderer width=1 height=1)
- (bounds 185.00 715.00)
- (drawsContent 1)
- (paintingPhases
- GraphicsLayerPaintForeground
- )
- )
- )
- )
- )
- )
- (GraphicsLayer
- (position 1.00 186.00)
- (bounds 185.00 15.00)
- (drawsContent 1)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintForeground
- )
- )
- (GraphicsLayer
- (position 186.00 1.00)
- (bounds 15.00 185.00)
- (drawsContent 1)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintForeground
- )
- )
- (GraphicsLayer
- (position 186.00 186.00)
- (bounds 15.00 15.00)
- (drawsContent 1)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintForeground
- )
- )
- )
- )
- )
- )
- )
-)
-
-
Modified: trunk/LayoutTests/platform/mac-wk1/compositing/overflow/stacking-context-composited-scroller-with-foreground-paint-phases-expected.txt (246470 => 246471)
--- trunk/LayoutTests/platform/mac-wk1/compositing/overflow/stacking-context-composited-scroller-with-foreground-paint-phases-expected.txt 2019-06-16 04:47:05 UTC (rev 246470)
+++ trunk/LayoutTests/platform/mac-wk1/compositing/overflow/stacking-context-composited-scroller-with-foreground-paint-phases-expected.txt 2019-06-16 05:33:28 UTC (rev 246471)
@@ -2,52 +2,36 @@
(GraphicsLayer
(anchor 0.00 0.00)
(bounds 800.00 600.00)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintForeground
- )
+ (paintingPhases [background, foreground])
(children 1
(GraphicsLayer
(bounds 800.00 600.00)
(contentsOpaque 1)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintForeground
- )
+ (paintingPhases [background, foreground])
(children 1
(GraphicsLayer
(position 8.00 8.00)
(bounds 322.00 322.00)
(drawsContent 1)
- (paintingPhases
- GraphicsLayerPaintBackground
- )
+ (paintingPhases [background])
(children 1
(GraphicsLayer
(offsetFromRenderer width=1 height=1)
(position 1.00 1.00)
(bounds 305.00 305.00)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintForeground
- )
+ (paintingPhases [background, foreground])
(children 2
(GraphicsLayer
(position 30.00 50.00)
(bounds 100.00 100.00)
(contentsOpaque 1)
- (paintingPhases
- GraphicsLayerPaintBackground
- GraphicsLayerPaintForeground
- )
+ (paintingPhases [background, foreground])
)
(GraphicsLayer
(offsetFromRenderer width=1 height=1)
(bounds 305.00 305.00)
(drawsContent 1)
- (paintingPhases
- GraphicsLayerPaintForeground
- )
+ (paintingPhases [foreground])
)
)
)
Modified: trunk/Source/WebCore/ChangeLog (246470 => 246471)
--- trunk/Source/WebCore/ChangeLog 2019-06-16 04:47:05 UTC (rev 246470)
+++ trunk/Source/WebCore/ChangeLog 2019-06-16 05:33:28 UTC (rev 246471)
@@ -1,3 +1,21 @@
+2019-06-15 Simon Fraser <[email protected]>
+
+ Make layerTreeAsText() output a bit less verbose
+ https://bugs.webkit.org/show_bug.cgi?id=198870
+
+ Reviewed by Tim Horton.
+
+ "accelerates drawing" was getting dumped twice for debug dumps.
+ Only dump the non-default state for "uses display-list drawing".
+ Use the new OptionSet<> dumping for GraphicsLayerPaintingPhases.
+
+ * platform/graphics/GraphicsLayer.cpp:
+ (WebCore::GraphicsLayer::dumpProperties const):
+ (WebCore::operator<<):
+ * platform/graphics/GraphicsLayer.h:
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::createTransformAnimationsFromKeyframes):
+
2019-06-15 Youenn Fablet <[email protected]>
Make MediaStream constructor take a Document instead of a ScriptExecutionContext
Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp (246470 => 246471)
--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2019-06-16 04:47:05 UTC (rev 246470)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2019-06-16 05:33:28 UTC (rev 246471)
@@ -918,10 +918,8 @@
if (!m_backfaceVisibility)
ts << indent << "(backfaceVisibility " << (m_backfaceVisibility ? "visible" : "hidden") << ")\n";
- if (behavior & LayerTreeAsTextDebug) {
+ if (behavior & LayerTreeAsTextDebug)
ts << indent << "(primary-layer-id " << primaryLayerID() << ")\n";
- ts << indent << "(client " << static_cast<void*>(m_client) << ")\n";
- }
if (m_backgroundColor.isValid() && client().shouldDumpPropertyForLayer(this, "backgroundColor", behavior))
ts << indent << "(backgroundColor " << m_backgroundColor.nameForRenderTreeAsText() << ")\n";
@@ -999,30 +997,9 @@
ts << indent << ")\n";
}
- if (behavior & LayerTreeAsTextIncludePaintingPhases && paintingPhase()) {
- ts << indent << "(paintingPhases\n";
- TextStream::IndentScope indentScope(ts);
- if (paintingPhase().contains(GraphicsLayerPaintingPhase::Background))
- ts << indent << "GraphicsLayerPaintBackground\n";
+ if (behavior & LayerTreeAsTextIncludePaintingPhases && paintingPhase())
+ ts << indent << "(paintingPhases " << paintingPhase() << ")\n";
- if (paintingPhase().contains(GraphicsLayerPaintingPhase::Foreground))
- ts << indent << "GraphicsLayerPaintForeground\n";
-
- if (paintingPhase().contains(GraphicsLayerPaintingPhase::Mask))
- ts << indent << "GraphicsLayerPaintMask\n";
-
- if (paintingPhase().contains(GraphicsLayerPaintingPhase::ChildClippingMask))
- ts << indent << "GraphicsLayerPaintChildClippingMask\n";
-
- if (paintingPhase().contains(GraphicsLayerPaintingPhase::OverflowContents))
- ts << indent << "GraphicsLayerPaintOverflowContents\n";
-
- if (paintingPhase().contains(GraphicsLayerPaintingPhase::CompositedScroll))
- ts << indent << "GraphicsLayerPaintCompositedScroll\n";
-
- ts << indent << ")\n";
- }
-
dumpAdditionalProperties(ts, behavior);
if (m_children.size()) {
@@ -1051,8 +1028,23 @@
return ts;
}
-TextStream& operator<<(TextStream& ts, const WebCore::GraphicsLayer::CustomAppearance& customAppearance)
+TextStream& operator<<(TextStream& ts, GraphicsLayerPaintingPhase phase)
{
+ switch (phase) {
+ case GraphicsLayerPaintingPhase::Background: ts << "background"; break;
+ case GraphicsLayerPaintingPhase::Foreground: ts << "foreground"; break;
+ case GraphicsLayerPaintingPhase::Mask: ts << "mask"; break;
+ case GraphicsLayerPaintingPhase::ClipPath: ts << "clip-path"; break;
+ case GraphicsLayerPaintingPhase::OverflowContents: ts << "overflow-contents"; break;
+ case GraphicsLayerPaintingPhase::CompositedScroll: ts << "composited-scroll"; break;
+ case GraphicsLayerPaintingPhase::ChildClippingMask: ts << "child-clipping-mask"; break;
+ }
+
+ return ts;
+}
+
+TextStream& operator<<(TextStream& ts, const GraphicsLayer::CustomAppearance& customAppearance)
+{
switch (customAppearance) {
case GraphicsLayer::CustomAppearance::None: ts << "none"; break;
case GraphicsLayer::CustomAppearance::ScrollingOverhang: ts << "scrolling-overhang"; break;
Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.h (246470 => 246471)
--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2019-06-16 04:47:05 UTC (rev 246470)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2019-06-16 05:33:28 UTC (rev 246471)
@@ -741,6 +741,7 @@
#endif
};
+WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const WebCore::GraphicsLayerPaintingPhase);
WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const Vector<GraphicsLayer::PlatformLayerID>&);
WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const GraphicsLayer::CustomAppearance&);
Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (246470 => 246471)
--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2019-06-16 04:47:05 UTC (rev 246470)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2019-06-16 05:33:28 UTC (rev 246471)
@@ -3726,11 +3726,10 @@
textStream << indent << "(in window " << tiledBacking()->isInWindow() << ")\n";
}
-
+
if (m_layer->wantsDeepColorBackingStore())
textStream << indent << "(deep color 1)\n";
-
if (behavior & LayerTreeAsTextIncludeContentLayers) {
dumpInnerLayer(textStream, "structural layer", m_structuralLayer.get(), behavior);
dumpInnerLayer(textStream, "contents clipping layer", m_contentsClippingLayer.get(), behavior);
@@ -3742,8 +3741,8 @@
}
if (behavior & LayerTreeAsTextDebug) {
- textStream << indent << "(accelerates drawing " << m_acceleratesDrawing << ")\n";
- textStream << indent << "(uses display-list drawing " << m_usesDisplayListDrawing << ")\n";
+ if (m_usesDisplayListDrawing)
+ textStream << indent << "(uses display-list drawing " << m_usesDisplayListDrawing << ")\n";
}
}
