From 808b1ca07d50e280ff498fd45122b6748b175b4c Mon Sep 17 00:00:00 2001 From: "abarth@webkit.org" Date: Sat, 1 Oct 2011 01:17:06 +0000 Subject: [PATCH] Remove ASSERT introduced in http://trac.webkit.org/changeset/96427 which is triggering all over the place. Sorting this out is covered in this bug: https://bugs.webkit.org/show_bug.cgi?id=69200 * rendering/RenderView.cpp: (WebCore::RenderView::layout): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@96445 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 11 +++++++++++ Source/WebCore/rendering/RenderView.cpp | 4 ---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 96b819a..82a2035 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,14 @@ +2011-09-30 Adam Barth + + Remove ASSERT introduced in http://trac.webkit.org/changeset/96427 + which is triggering all over the place. + + Sorting this out is covered in this bug: + https://bugs.webkit.org/show_bug.cgi?id=69200 + + * rendering/RenderView.cpp: + (WebCore::RenderView::layout): + 2011-09-30 Sheriff Bot Unreviewed, rolling out r96426. diff --git a/Source/WebCore/rendering/RenderView.cpp b/Source/WebCore/rendering/RenderView.cpp index 775b15d..1fefac4 100644 --- a/Source/WebCore/rendering/RenderView.cpp +++ b/Source/WebCore/rendering/RenderView.cpp @@ -142,10 +142,6 @@ void RenderView::layout() ASSERT(m_layoutState == &state); m_layoutState = 0; setNeedsLayout(false); -#if !ASSERT_DISABLED - for (RenderObject* renderer = this; renderer; renderer = renderer->nextInPreOrder()) - ASSERT(!renderer->needsLayout()); -#endif } void RenderView::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState, bool* wasFixed) const -- 2.7.4