Skip to content
Permalink
Browse files
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):


Canonical link: https://commits.webkit.org/195182@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@224225 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
rniwa committed Oct 31, 2017
1 parent 0159d30 commit f13d6ca58e64570b7e86f77f9e425baab342bd7f
Showing 2 changed files with 14 additions and 2 deletions.
@@ -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
@@ -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);

0 comments on commit f13d6ca

Please sign in to comment.