Assert that no script is executed during LayoutPhase::InRenderTreeLayout
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 31 Oct 2017 08:39:38 +0000 (08:39 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 31 Oct 2017 08:39:38 +0000 (08:39 +0000)
https://bugs.webkit.org/show_bug.cgi?id=179046

Reviewed by Antti Koivisto.

Added NoEventDispatchAssertion to LayoutPhase::InRenderTreeLayout.

* page/LayoutContext.cpp:
(WebCore::LayoutContext::layout):

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

Source/WebCore/ChangeLog
Source/WebCore/page/LayoutContext.cpp

index 785a6ab..3ee4961 100644 (file)
@@ -1,3 +1,15 @@
+2017-10-30  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Assert that no script is executed during LayoutPhase::InRenderTreeLayout
+        https://bugs.webkit.org/show_bug.cgi?id=179046
+
+        Reviewed by Antti Koivisto.
+
+        Added NoEventDispatchAssertion to LayoutPhase::InRenderTreeLayout.
+
+        * page/LayoutContext.cpp:
+        (WebCore::LayoutContext::layout):
+
 2017-10-31  Devin Rousso  <webkit@devinrousso.com>
 
         Web Inspector: replace Canvas stack iteration with createScriptCallStack
index 16acf85..00b599d 100644 (file)
@@ -32,6 +32,7 @@
 #include "FrameView.h"
 #include "InspectorInstrumentation.h"
 #include "Logging.h"
+#include "NoEventDispatchAssertion.h"
 #include "RenderElement.h"
 #include "RenderView.h"
 #include "Settings.h"
@@ -210,7 +211,7 @@ void LayoutContext::layout()
     }
     {
         SetForScope<LayoutPhase> layoutPhase(m_layoutPhase, LayoutPhase::InRenderTreeLayout);
-    
+        NoEventDispatchAssertion noEventDispatchAssertion;
         SubtreeLayoutStateMaintainer subtreeLayoutStateMaintainer(subtreeLayoutRoot());
         RenderView::RepaintRegionAccumulator repaintRegionAccumulator(renderView());
 #ifndef NDEBUG
@@ -222,7 +223,6 @@ void LayoutContext::layout()
         applyTextSizingIfNeeded(*layoutRoot.get());
 #endif
         clearSubtreeLayoutRoot();
-
     }
     {
         SetForScope<LayoutPhase> layoutPhase(m_layoutPhase, LayoutPhase::InViewSizeAdjust);