Title: [187757] trunk/Source/WebCore
- Revision
- 187757
- Author
- za...@apple.com
- Date
- 2015-08-03 13:29:55 -0700 (Mon, 03 Aug 2015)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (187756 => 187757)
--- trunk/Source/WebCore/ChangeLog 2015-08-03 20:23:36 UTC (rev 187756)
+++ trunk/Source/WebCore/ChangeLog 2015-08-03 20:29:55 UTC (rev 187757)
@@ -1,3 +1,14 @@
+2015-08-03 Zalan Bujtas <za...@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-qu...@webkit.org>
Unreviewed, rolling out r187729.
Modified: trunk/Source/WebCore/page/FrameView.cpp (187756 => 187757)
--- trunk/Source/WebCore/page/FrameView.cpp 2015-08-03 20:23:36 UTC (rev 187756)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-08-03 20:29:55 UTC (rev 187757)
@@ -1189,7 +1189,6 @@
if (inChildFrameLayoutWithFrameFlattening) {
startLayoutAtMainFrameViewIfNeeded(allowSubtree);
- LOG(Layout, " frame flattening, starting from root");
RenderElement* root = m_layoutRoot ? m_layoutRoot : frame().document()->renderView();
if (!root || !root->needsLayout())
return;
@@ -3797,6 +3796,7 @@
while (parentView->parentFrameView())
parentView = parentView->parentFrameView();
+ LOG(Layout, " frame flattening, starting from root");
parentView->layout(allowSubtree);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
