Changeset 257752 in webkit

Timestamp:

Mar 2, 2020 6:19:13 PM (4 years ago)

Author:

Alan Bujtas

Message:

Frame::layerTreeAsText should make sure that all the frames are clean and up-to-date
​https://bugs.webkit.org/show_bug.cgi?id=208484
<rdar://problem/59972433>

Reviewed by Simon Fraser.

window.internals.layerTreeAsText() is designed to dump the layer structure of the current page content.
It calls updateLayout() on the mainframe's document to make sure we collect the layer information on a clear tree.
However Document::updateLayout is scoped to the current document's frame (the mainframe in this case) and
leaves all the other frames dirty.

• page/Frame.cpp:

(WebCore::Frame::layerTreeAsText const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/Frame.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-03-02  Zalan Bujtas  <zalan@apple.com>
+
+        Frame::layerTreeAsText should make sure that all the frames are clean and up-to-date
+        https://bugs.webkit.org/show_bug.cgi?id=208484
+        <rdar://problem/59972433>
+
+        Reviewed by Simon Fraser.
+
+        window.internals.layerTreeAsText() is designed to dump the layer structure of the current page content.
+        It calls updateLayout() on the mainframe's document to make sure we collect the layer information on a clear tree.
+        However Document::updateLayout is scoped to the current document's frame (the mainframe in this case) and
+        leaves all the other frames dirty.
+
+        * page/Frame.cpp:
+        (WebCore::Frame::layerTreeAsText const):
+
 2020-03-02  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/page/Frame.cpp

@@ -860 +860 @@
 String Frame::layerTreeAsText(LayerTreeFlags flags) const
 {
-    document()->updateLayout();
-
+    if (!m_view)
+        return { };
+
+    m_view->updateLayoutAndStyleIfNeededRecursive();
     if (!contentRenderer())
-        return String();
+        return { };
 
     return contentRenderer()->compositor().layerTreeAsText(flags);