[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):


Canonical link: https://commits.webkit.org/194611@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@223549 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog

@@ -1,3 +1,17 @@
+2017-10-17  Zalan Bujtas  <zalan@apple.com>
+
+        [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  <antti@apple.com>
 
         Text nodes with display:contents parent should render as if they were wrapped in an unstyled <span>

Source/WebCore/page/FrameView.cpp

@@ -1365,6 +1365,9 @@ void FrameView::layout(bool allowSubtree)
 
     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,21 +1401,9 @@ void FrameView::layout(bool allowSubtree)
         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;
-
-    RenderLayer* layer = nullptr;
-    bool subtree = false;
-    RenderElement* root = nullptr;
+        m_layoutPhase = InPreLayout;
 
-    ++m_nestedLayoutCount;
-
-    {
-        SetForScope<bool> changeSchedulingEnabled(m_layoutSchedulingEnabled, false);
+        ++m_nestedLayoutCount;
 
         autoSizeIfEnabled();