Changeset 187757 in webkit

Timestamp:

Aug 3, 2015 1:29:55 PM (9 years ago)

Author:

Alan Bujtas

Message:

Move "starting from root" frame flattening logging to the correct place.
​https://bugs.webkit.org/show_bug.cgi?id=147571

Reviewed by Simon Fraser.

• page/FrameView.cpp:

(WebCore::FrameView::startLayoutAtMainFrameViewIfNeeded):
(WebCore::FrameView::layout): Deleted.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-08-03  Zalan Bujtas  <zalan@apple.com>
+
+        Move "starting from root" frame flattening logging to the correct place.
+        https://bugs.webkit.org/show_bug.cgi?id=147571
+
+        Reviewed by Simon Fraser.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::startLayoutAtMainFrameViewIfNeeded):
+        (WebCore::FrameView::layout): Deleted.
+
 2015-08-03  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -1190 +1190 @@
     if (inChildFrameLayoutWithFrameFlattening) {
         startLayoutAtMainFrameViewIfNeeded(allowSubtree);
-        LOG(Layout, "  frame flattening, starting from root");
         RenderElement* root = m_layoutRoot ? m_layoutRoot : frame().document()->renderView();
         if (!root || !root->needsLayout())
@@ -3798 +3797 @@
         parentView = parentView->parentFrameView();
 
+    LOG(Layout, "  frame flattening, starting from root");
     parentView->layout(allowSubtree);
 }