Changeset 236087 in webkit

Timestamp:

Sep 17, 2018, 3:05:42 PM (7 years ago)

Author:

Simon Fraser

Message:

Add support for dumping the GraphicsLayer tree via notifyutil
​https://bugs.webkit.org/show_bug.cgi?id=189639

Reviewed by Zalan Bujtas.

Make "notifyutil -p com.apple.WebKit.showGraphicsLayerTree" work. It dumps the GraphicsLayer tree
for each top-level document (GraphicsLayers are connected across frame boundaries, so this prints
the entire tree for each main frame).

It uses WTFLogAlways rather than fprintf() so output shows on all platforms (other tree dumps should
be converted in the same way).

• page/mac/PageMac.mm:

(WebCore::Page::platformInitialize):

• platform/graphics/GraphicsLayer.cpp:

(showGraphicsLayerTree):

• rendering/RenderLayerCompositor.cpp:

(showGraphicsLayerTreeForCompositor):

• rendering/RenderLayerCompositor.h:
• rendering/RenderObject.cpp:

(WebCore::printGraphicsLayerTreeForLiveDocuments):

• rendering/RenderObject.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/mac/PageMac.mm (modified) (1 diff)
• platform/graphics/GraphicsLayer.cpp (modified) (1 diff)
• rendering/RenderLayerCompositor.cpp (modified) (1 diff)
• rendering/RenderLayerCompositor.h (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (2 diffs)
• rendering/RenderObject.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-09-14  Simon Fraser  <simon.fraser@apple.com>
+
+        Add support for dumping the GraphicsLayer tree via notifyutil
+        https://bugs.webkit.org/show_bug.cgi?id=189639
+
+        Reviewed by Zalan Bujtas.
+
+        Make "notifyutil -p com.apple.WebKit.showGraphicsLayerTree" work. It dumps the GraphicsLayer tree
+        for each top-level document (GraphicsLayers are connected across frame boundaries, so this prints
+        the entire tree for each main frame).
+        
+        It uses WTFLogAlways rather than fprintf() so output shows on all platforms (other tree dumps should
+        be converted in the same way).
+
+        * page/mac/PageMac.mm:
+        (WebCore::Page::platformInitialize):
+        * platform/graphics/GraphicsLayer.cpp:
+        (showGraphicsLayerTree):
+        * rendering/RenderLayerCompositor.cpp:
+        (showGraphicsLayerTreeForCompositor):
+        * rendering/RenderLayerCompositor.h:
+        * rendering/RenderObject.cpp:
+        (WebCore::printGraphicsLayerTreeForLiveDocuments):
+        * rendering/RenderObject.h:
+
 2018-09-17  Christopher Reid  <chris.reid@sony.com>
 

trunk/Source/WebCore/page/mac/PageMac.mm

@@ -59 +59 @@
         PAL::registerNotifyCallback("com.apple.WebKit.showRenderTree", printRenderTreeForLiveDocuments);
         PAL::registerNotifyCallback("com.apple.WebKit.showLayerTree", printLayerTreeForLiveDocuments);
+        PAL::registerNotifyCallback("com.apple.WebKit.showGraphicsLayerTree", printGraphicsLayerTreeForLiveDocuments);
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
         PAL::registerNotifyCallback("com.apple.WebKit.showLayoutTree", Layout::printLayoutTreeForLiveDocuments);

trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp

@@ -981 +981 @@
 
     String output = layer->layerTreeAsText(WebCore::LayerTreeAsTextShowAll);
-    fprintf(stderr, "%s\n", output.utf8().data());
-}
-#endif
+    WTFLogAlways("%s\n", output.utf8().data());
+}
+#endif

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -4147 +4147 @@
 
 } // namespace WebCore
+
+#if ENABLE(TREE_DEBUGGING)
+void showGraphicsLayerTreeForCompositor(WebCore::RenderLayerCompositor& compositor)
+{
+    showGraphicsLayerTree(compositor.rootGraphicsLayer());
+}
+#endif

trunk/Source/WebCore/rendering/RenderLayerCompositor.h

@@ -581 +581 @@
 
 } // namespace WebCore
+
+#if ENABLE(TREE_DEBUGGING)
+// Outside the WebCore namespace for ease of invocation from the debugger.
+void showGraphicsLayerTreeForCompositor(WebCore::RenderLayerCompositor&);
+#endif

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -53 +53 @@
 #include "RenderLayer.h"
 #include "RenderLayerBacking.h"
+#include "RenderLayerCompositor.h"
 #include "RenderMultiColumnFlow.h"
 #include "RenderRuby.h"
@@ -1938 +1939 @@
 }
 
+void printGraphicsLayerTreeForLiveDocuments()
+{
+    for (const auto* document : Document::allDocuments()) {
+        if (!document->renderView())
+            continue;
+        if (document->frame() && document->frame()->isMainFrame()) {
+            WTFLogAlways("Graphics layer tree for root document %p %s", document, document->url().string().utf8().data());
+            showGraphicsLayerTreeForCompositor(document->renderView()->compositor());
+        }
+    }
+}
+
 #endif // ENABLE(TREE_DEBUGGING)
 

trunk/Source/WebCore/rendering/RenderObject.h

@@ -1104 +1104 @@
 void printRenderTreeForLiveDocuments();
 void printLayerTreeForLiveDocuments();
+void printGraphicsLayerTreeForLiveDocuments();
 #endif