From 4fa139898d7a5e3f61f12e2d4ce2fc015dd958b3 Mon Sep 17 00:00:00 2001 From: "jamesr@google.com" Date: Wed, 22 Feb 2012 03:16:11 +0000 Subject: [PATCH] Partially revert r108418 - move allowEventDispatch() call back to where it used to be. Rubber-stamped by Ryosuke Niwa. Tested by fast/text/find-layout-crash.html * dom/ContainerNode.cpp: (WebCore::ContainerNode::removeChildren): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108435 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 11 +++++++++++ Source/WebCore/dom/ContainerNode.cpp | 5 +++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 6478e07a..6c18dd2 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,14 @@ +2012-02-21 James Robinson + + Partially revert r108418 - move allowEventDispatch() call back to where it used to be. + + Rubber-stamped by Ryosuke Niwa. + + Tested by fast/text/find-layout-crash.html + + * dom/ContainerNode.cpp: + (WebCore::ContainerNode::removeChildren): + 2012-02-21 Anders Carlsson Background jitters on pages with background-attachment: fixed diff --git a/Source/WebCore/dom/ContainerNode.cpp b/Source/WebCore/dom/ContainerNode.cpp index b40ea25..eaa1e5e 100644 --- a/Source/WebCore/dom/ContainerNode.cpp +++ b/Source/WebCore/dom/ContainerNode.cpp @@ -592,6 +592,9 @@ void ContainerNode::removeChildren() removedChild->detach(); } + // FIXME: This should be just above dispatchSubtreeModifiedEvent(); + allowEventDispatch(); + childrenChanged(false, 0, 0, -static_cast(removedChildrenCount)); for (i = 0; i < removedChildrenCount; ++i) { @@ -603,8 +606,6 @@ void ContainerNode::removeChildren() // and its optimized version removeChildren(). } - allowEventDispatch(); - dispatchSubtreeModifiedEvent(); } -- 2.7.4