Title: [223549] trunk/Source/WebCore
- Revision
- 223549
- Author
- [email protected]
- Date
- 2017-10-17 09:17:38 -0700 (Tue, 17 Oct 2017)
Log Message
[FrameView::layout cleanup] Merge InPreLayout blocks
https://bugs.webkit.org/show_bug.cgi?id=178373
Reviewed by Antti Koivisto.
Remove redundant comment and scoping.
No change in functionality.
* page/FrameView.cpp:
(WebCore::FrameView::layout):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (223548 => 223549)
--- trunk/Source/WebCore/ChangeLog 2017-10-17 14:39:54 UTC (rev 223548)
+++ trunk/Source/WebCore/ChangeLog 2017-10-17 16:17:38 UTC (rev 223549)
@@ -1,3 +1,17 @@
+2017-10-17 Zalan Bujtas <[email protected]>
+
+ [FrameView::layout cleanup] Merge InPreLayout blocks
+ https://bugs.webkit.org/show_bug.cgi?id=178373
+
+ Reviewed by Antti Koivisto.
+
+ Remove redundant comment and scoping.
+
+ No change in functionality.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::layout):
+
2017-10-17 Antti Koivisto <[email protected]>
Text nodes with display:contents parent should render as if they were wrapped in an unstyled <span>
Modified: trunk/Source/WebCore/page/FrameView.cpp (223548 => 223549)
--- trunk/Source/WebCore/page/FrameView.cpp 2017-10-17 14:39:54 UTC (rev 223548)
+++ trunk/Source/WebCore/page/FrameView.cpp 2017-10-17 16:17:38 UTC (rev 223549)
@@ -1365,6 +1365,9 @@
Document& document = *frame().document();
ASSERT(document.pageCacheState() == Document::NotInPageCache);
+ RenderElement* root = nullptr;
+ RenderLayer* layer = nullptr;
+ bool subtree = false;
{
SetForScope<bool> changeSchedulingEnabled(m_layoutSchedulingEnabled, false);
@@ -1398,22 +1401,10 @@
if (hasOneRef())
return;
- // Close block here so we can set up the font cache purge preventer, which we will still
- // want in scope even after we want m_layoutSchedulingEnabled to be restored again.
- // The next block sets m_layoutSchedulingEnabled back to false once again.
- }
+ m_layoutPhase = InPreLayout;
- m_layoutPhase = InPreLayout;
+ ++m_nestedLayoutCount;
- RenderLayer* layer = nullptr;
- bool subtree = false;
- RenderElement* root = nullptr;
-
- ++m_nestedLayoutCount;
-
- {
- SetForScope<bool> changeSchedulingEnabled(m_layoutSchedulingEnabled, false);
-
autoSizeIfEnabled();
root = m_layoutRoot ? m_layoutRoot : document.renderView();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
