Changeset 199068 in webkit

Timestamp:

Apr 5, 2016 12:40:07 PM (8 years ago)

Author:

Simon Fraser

Message:

Add a "notifyutil" callback for dumping the RenderLayer tree, and move the registration to Page code
​https://bugs.webkit.org/show_bug.cgi?id=156224

Reviewed by Zalan Bujtas.

Make it possible to run:

notifyutil -p com.apple.WebKit.showLayerTree

on the command line and have it dump out layer trees for all live documents, in
debug builds.

Move callback registration from RenderObject's constructor to Page.

• page/mac/PageMac.mm:

(WebCore::Page::platformInitialize):

• rendering/RenderObject.cpp:

(WebCore::printLayerTreeForLiveDocuments):
(WebCore::RenderObject::RenderObject): Deleted.

• rendering/RenderObject.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/mac/PageMac.mm (modified) (2 diffs)
• rendering/RenderObject.cpp (modified) (5 diffs)
• rendering/RenderObject.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-04-05  Simon Fraser  <simon.fraser@apple.com>
+
+        Add a "notifyutil" callback for dumping the RenderLayer tree, and move the registration to Page code
+        https://bugs.webkit.org/show_bug.cgi?id=156224
+
+        Reviewed by Zalan Bujtas.
+
+        Make it possible to run:
+            notifyutil -p com.apple.WebKit.showLayerTree
+        on the command line and have it dump out layer trees for all live documents, in
+        debug builds.
+        
+        Move callback registration from RenderObject's constructor to Page.
+
+        * page/mac/PageMac.mm:
+        (WebCore::Page::platformInitialize):
+        * rendering/RenderObject.cpp:
+        (WebCore::printLayerTreeForLiveDocuments):
+        (WebCore::RenderObject::RenderObject): Deleted.
+        * rendering/RenderObject.h:
+
 2016-04-05  Antoine Quint  <graouts@apple.com>
 

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

@@ -33 +33 @@
 #import "FrameLoader.h"
 #import "FrameTree.h"
+#import "Logging.h"
 #import "MainFrame.h"
+#import "RenderObject.h"
 
 #if PLATFORM(IOS)
@@ -51 +53 @@
 #else
     addSchedulePair(SchedulePair::create([NSRunLoop currentRunLoop], kCFRunLoopCommonModes));
+#endif
+
+#if ENABLE(TREE_DEBUGGING)
+    static std::once_flag onceFlag;
+    std::call_once(onceFlag, [] {
+        registerNotifyCallback("com.apple.WebKit.showRenderTree", printRenderTreeForLiveDocuments);
+        registerNotifyCallback("com.apple.WebKit.showLayerTree", printLayerTreeForLiveDocuments);
+    });
 #endif
 }

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -44 +44 @@
 #include "HTMLTableElement.h"
 #include "HitTestResult.h"
-#include "Logging.h"
 #include "LogicalSelectionOffsetCaches.h"
 #include "MainFrame.h"
@@ -85 +84 @@
 
 #ifndef NDEBUG
-void printRenderTreeForLiveDocuments();
 
 RenderObject::SetLayoutNeededForbiddenScope::SetLayoutNeededForbiddenScope(RenderObject* renderObject, bool isForbidden)
@@ -129 +127 @@
 #ifndef NDEBUG
     renderObjectCounter.increment();
-    static std::once_flag onceFlag;
-    std::call_once(onceFlag, [] {
-        registerNotifyCallback("com.apple.WebKit.showRenderTree", printRenderTreeForLiveDocuments);
-    });
 #endif
 }
@@ -2278 +2272 @@
 }
 
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
+
 void printRenderTreeForLiveDocuments()
 {
@@ -2290 +2285 @@
     }
 }
+
+void printLayerTreeForLiveDocuments()
+{
+    for (const auto* document : Document::allDocuments()) {
+        if (!document->renderView() || document->inPageCache())
+            continue;
+        if (document->frame() && document->frame()->isMainFrame())
+            fprintf(stderr, "----------------------main frame--------------------------\n");
+        fprintf(stderr, "%s", document->url().string().utf8().data());
+        showLayerTree(document->renderView());
+    }
+}
+
+#endif // ENABLE(TREE_DEBUGGING)
+
+} // namespace WebCore
+
+#if ENABLE(TREE_DEBUGGING)
+
+void showNodeTree(const WebCore::RenderObject* object)
+{
+    if (!object)
+        return;
+    object->showNodeTreeForThis();
+}
+
+void showLineTree(const WebCore::RenderObject* object)
+{
+    if (!object)
+        return;
+    object->showLineTreeForThis();
+}
+
+void showRenderTree(const WebCore::RenderObject* object)
+{
+    if (!object)
+        return;
+    object->showRenderTreeForThis();
+}
+
 #endif
-} // namespace WebCore
-
-#if ENABLE(TREE_DEBUGGING)
-
-void showNodeTree(const WebCore::RenderObject* object)
-{
-    if (!object)
-        return;
-    object->showNodeTreeForThis();
-}
-
-void showLineTree(const WebCore::RenderObject* object)
-{
-    if (!object)
-        return;
-    object->showLineTreeForThis();
-}
-
-void showRenderTree(const WebCore::RenderObject* object)
-{
-    if (!object)
-        return;
-    object->showRenderTreeForThis();
-}
-
-#endif

trunk/Source/WebCore/rendering/RenderObject.h

@@ -1153 +1153 @@
 }
 
+#if ENABLE(TREE_DEBUGGING)
+void printRenderTreeForLiveDocuments();
+void printLayerTreeForLiveDocuments();
+#endif
+
 } // namespace WebCore