commit 82a13f1781ea5e79563e8403cb24ef9fd1c857db
author rniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Fri Oct 18 22:45:59 2019 +0000
committer rniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Fri Oct 18 22:45:59 2019 +0000
tree cf06b1d3f11bd9d4d424b3d2942e4513ab1a7b31
parent a5efe12a6fa53de81e7a0530577e0728788d4eff

Document::m_closeAfterStyleRecalc is unnecessary
https://bugs.webkit.org/show_bug.cgi?id=203143

Reviewed by Antti Koivisto.

Removed the code to defer implicit close until the style recalc is done
since we call FrameLoader::checkCompleted asynchronously via a timer these days.

* dom/Document.cpp:
(WebCore::Document::resolveStyle):
(WebCore::Document::implicitClose):
* dom/Document.h:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@251305 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 5bab2e0..ef3679b 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2019-10-17  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Document::m_closeAfterStyleRecalc is unnecessary
+        https://bugs.webkit.org/show_bug.cgi?id=203143
+
+        Reviewed by Antti Koivisto.
+
+        Removed the code to defer implicit close until the style recalc is done
+        since we call FrameLoader::checkCompleted asynchronously via a timer these days.
+
+        * dom/Document.cpp:
+        (WebCore::Document::resolveStyle):
+        (WebCore::Document::implicitClose):
+        * dom/Document.h:
+
 2019-10-17  Dean Jackson  <dino@apple.com>
 
         texImage2D for a half-float texture only accepts null

Source/WebCore/dom/Document.cpp

diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
index 37b7cc2..4b93768 100644
--- a/Source/WebCore/dom/Document.cpp
+++ b/Source/WebCore/dom/Document.cpp
@@ -1978,12 +1978,6 @@
         // FIXME: Assert ASSERT(!needsStyleRecalc()) here. Do we still have some cases where it's not true?
     }
 
-    // If we wanted to call implicitClose() during recalcStyle, do so now that we're finished.
-    if (m_closeAfterStyleRecalc) {
-        m_closeAfterStyleRecalc = false;
-        implicitClose();
-    }
-
     InspectorInstrumentation::didRecalculateStyle(*this);
 
     // Some animated images may now be inside the viewport due to style recalc,
@@ -2920,12 +2914,7 @@
 
 void Document::implicitClose()
 {
-    // If we're in the middle of recalcStyle, we need to defer the close until the style information is accurate and all elements are re-attached.
-    if (m_inStyleRecalc) {
-        m_closeAfterStyleRecalc = true;
-        return;
-    }
-
+    RELEASE_ASSERT(!m_inStyleRecalc);
     bool wasLocationChangePending = frame() && frame()->navigationScheduler().locationChangePending();
     bool doload = !parsing() && m_parser && !m_processingLoadEvent && !wasLocationChangePending;
     

Source/WebCore/dom/Document.h

diff --git a/Source/WebCore/dom/Document.h b/Source/WebCore/dom/Document.h
index ea16ce7..00568a9 100644
--- a/Source/WebCore/dom/Document.h
+++ b/Source/WebCore/dom/Document.h
@@ -1992,7 +1992,6 @@
 
     bool m_needsFullStyleRebuild { false };
     bool m_inStyleRecalc { false };
-    bool m_closeAfterStyleRecalc { false };
     bool m_inRenderTreeUpdate { false };
     bool m_isResolvingTreeStyle { false };