Changeset 155545 in webkit

Timestamp:

Sep 11, 2013 11:33:02 AM (11 years ago)

Author:

Simon Fraser

Message:

Optionally show visual and layout overflow rects in layer tree dumps
​https://bugs.webkit.org/show_bug.cgi?id=121135

Reviewed by Beth Dakin.

When calling showLayerTree() from the debugger, show overflow rects
(visaul and layout) for renderers.

Does not affect test output.

• rendering/RenderLayer.cpp:

(showLayerTree): Pass the new flag to show overflow rects.

• rendering/RenderTreeAsText.cpp:

(WebCore::RenderTreeAsText::writeRenderObject): Print the rects.
(WebCore::write): Don't force layout on subframes if the "dont' layout"
flag is set.

• rendering/RenderTreeAsText.h: New flag.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (1 diff)
• rendering/RenderTreeAsText.cpp (modified) (2 diffs)
• rendering/RenderTreeAsText.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-10  Simon Fraser  <simon.fraser@apple.com>
+
+        Optionally show visual and layout overflow rects in layer tree dumps
+        https://bugs.webkit.org/show_bug.cgi?id=121135
+
+        Reviewed by Beth Dakin.
+
+        When calling showLayerTree() from the debugger, show overflow rects
+        (visaul and layout) for renderers.
+        
+        Does not affect test output.
+
+        * rendering/RenderLayer.cpp:
+        (showLayerTree): Pass the new flag to show overflow rects.
+        * rendering/RenderTreeAsText.cpp:
+        (WebCore::RenderTreeAsText::writeRenderObject): Print the rects.
+        (WebCore::write): Don't force layout on subframes if the "dont' layout"
+        flag is set.
+        * rendering/RenderTreeAsText.h: New flag.
+
 2013-09-11  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -6494 +6494 @@
         return;
 
-    WTF::String output = externalRepresentation(&layer->renderer().frame(), WebCore::RenderAsTextShowAllLayers | WebCore::RenderAsTextShowLayerNesting | WebCore::RenderAsTextShowCompositedLayers | WebCore::RenderAsTextShowAddresses | WebCore::RenderAsTextShowIDAndClass | WebCore::RenderAsTextDontUpdateLayout | WebCore::RenderAsTextShowLayoutState);
+    WTF::String output = externalRepresentation(&layer->renderer().frame(), WebCore::RenderAsTextShowAllLayers | WebCore::RenderAsTextShowLayerNesting | WebCore::RenderAsTextShowCompositedLayers | WebCore::RenderAsTextShowAddresses | WebCore::RenderAsTextShowIDAndClass | WebCore::RenderAsTextDontUpdateLayout | WebCore::RenderAsTextShowLayoutState | WebCore::RenderAsTextShowOverflow);
     fprintf(stderr, "%s\n", output.utf8().data());
 }

trunk/Source/WebCore/rendering/RenderTreeAsText.cpp

@@ -486 +486 @@
             ts << ")";
     }
+    
+    if (behavior & RenderAsTextShowOverflow && o.isBox()) {
+        const RenderBox& box = toRenderBox(o);
+        if (box.hasRenderOverflow()) {
+            LayoutRect layoutOverflow = box.layoutOverflowRect();
+            ts << " (layout overflow " << layoutOverflow.x().toInt() << "," << layoutOverflow.y().toInt() << " " << layoutOverflow.width().toInt() << "x" << layoutOverflow.height().toInt() << ")";
+            
+            if (box.hasVisualOverflow()) {
+                LayoutRect visualOverflow = box.visualOverflowRect();
+                ts << " (visual overflow " << visualOverflow.x().toInt() << "," << visualOverflow.y().toInt() << " " << visualOverflow.width().toInt() << "x" << visualOverflow.height().toInt() << ")";
+            }
+        }
+    }
 
 #if PLATFORM(QT)
@@ -591 +604 @@
             FrameView* view = toFrameView(widget);
             if (RenderView* root = view->frame().contentRenderer()) {
-                view->layout();
+                if (!(behavior & RenderAsTextDontUpdateLayout))
+                    view->layout();
                 RenderLayer* l = root->layer();
                 if (l)

trunk/Source/WebCore/rendering/RenderTreeAsText.h

@@ -52 +52 @@
     RenderAsTextPrintingMode = 1 << 5, // Dump the tree in printing mode.
     RenderAsTextDontUpdateLayout = 1 << 6, // Don't update layout, to make it safe to call showLayerTree() from the debugger inside layout or painting code.
-    RenderAsTextShowLayoutState = 1 << 7 // Print the various 'needs layout' bits on renderers.
+    RenderAsTextShowLayoutState = 1 << 7, // Print the various 'needs layout' bits on renderers.
+    RenderAsTextShowOverflow = 1 << 8 // Print layout and visual overflow.
 };
 typedef unsigned RenderAsTextBehavior;