Changeset 179947 in webkit

Timestamp:

Feb 11, 2015, 12:34:15 PM (10 years ago)

Author:

Simon Fraser

Message:

Improve the showFrameTree() output slightly
​https://bugs.webkit.org/show_bug.cgi?id=141482

Reviewed by Zalan Bujtas.

Have showFrameTree() show the Frame's RenderView so it can be correlated with
layer dumps, and show styleRecalc and needsLayout state.

• page/FrameTree.cpp:

(printFrames):

• page/FrameView.cpp:

(WebCore::FrameView::updateLayoutAndStyleIfNeededRecursive): Add an explanatory
comment about why we don't walk the Frame tree.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameTree.cpp (modified) (1 diff)
• page/FrameView.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-02-11  Simon Fraser  <simon.fraser@apple.com>
+
+        Improve the showFrameTree() output slightly
+        https://bugs.webkit.org/show_bug.cgi?id=141482
+
+        Reviewed by Zalan Bujtas.
+
+        Have showFrameTree() show the Frame's RenderView so it can be correlated with
+        layer dumps, and show styleRecalc and needsLayout state.
+
+        * page/FrameTree.cpp:
+        (printFrames):
+        * page/FrameView.cpp:
+        (WebCore::FrameView::updateLayoutAndStyleIfNeededRecursive): Add an explanatory
+        comment about why we don't walk the Frame tree.
+
 2015-02-11  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/page/FrameTree.cpp

@@ -425 +425 @@
     printf("  ownerElement=%p\n", frame.ownerElement());
     printIndent(indent);
-    printf("  frameView=%p\n", view);
+    printf("  frameView=%p (needs layout %d)\n", view, view ? view->needsLayout() : false);
     printIndent(indent);
-    printf("  document=%p\n", frame.document());
+    printf("  renderView=%p\n", view ? view->renderView() : nullptr);
     printIndent(indent);
-    printf("  uri=%s\n\n", frame.document()->documentURI().utf8().data());
+    printf("  document=%p (needs style recalc %d)\n", frame.document(), frame.document() ? frame.document()->needsStyleRecalc() : false);
+    printIndent(indent);
+    printf("  uri=%s\n", frame.document()->documentURI().utf8().data());
 
     for (WebCore::Frame* child = frame.tree().firstChild(); child; child = child->tree().nextSibling())

trunk/Source/WebCore/page/FrameView.cpp

@@ -3968 +3968 @@
     // calls, as they can potentially re-enter a layout of the parent frame view, which may add/remove scrollbars
     // and thus mutates the children() set.
+    // We use the Widget children because walking the Frame tree would include display:none frames.
     Vector<Ref<FrameView>, 16> childViews;
     childViews.reserveInitialCapacity(children().size());