From 6b4141ebc7ee33b6e1db3d65c3be2517c6dc216e Mon Sep 17 00:00:00 2001 From: David Hyatt Date: Wed, 8 Oct 2014 13:24:00 +0000 Subject: [PATCH] Merge r174126 - Remove a multicolumn ASSERT and replace with a guard. https://bugs.webkit.org/show_bug.cgi?id=137272 Reviewed by Alexey Proskuryakov. * rendering/RenderMultiColumnFlowThread.cpp: (WebCore::isValidColumnSpanner): For now remove the assert that is tripping and replace it with a guard until we can figure out why it's getting hit. Canonical link: https://commits.webkit.org/154760.62@webkitgtk/2.6 git-svn-id: https://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.6@174450 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 12 ++++++++++++ .../rendering/RenderMultiColumnFlowThread.cpp | 8 ++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 2276fff94e1a..d91e5dc4ccc5 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,15 @@ +2014-09-30 David Hyatt + + Remove a multicolumn ASSERT and replace with a guard. + https://bugs.webkit.org/show_bug.cgi?id=137272 + + Reviewed by Alexey Proskuryakov. + + * rendering/RenderMultiColumnFlowThread.cpp: + (WebCore::isValidColumnSpanner): + For now remove the assert that is tripping and replace it with a guard + until we can figure out why it's getting hit. + 2014-08-01 Sergio Villar Senin Caret not shown at the end of line in overtype mode diff --git a/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp b/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp index a30627b83eb1..7dfe8362161a 100644 --- a/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp +++ b/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp @@ -245,8 +245,12 @@ RenderObject* RenderMultiColumnFlowThread::resolveMovedChild(RenderObject* child static bool isValidColumnSpanner(RenderMultiColumnFlowThread* flowThread, RenderObject* descendant) { // We assume that we're inside the flow thread. This function is not to be called otherwise. - ASSERT(descendant->isDescendantOf(flowThread)); - + // ASSERT(descendant->isDescendantOf(flowThread)); + // FIXME: Put this back in when we figure out why spanner-crash.html is triggering it. + // See https://bugs.webkit.org/show_bug.cgi?id=137273 + if (!descendant->isDescendantOf(flowThread)) + return false; + // First make sure that the renderer itself has the right properties for becoming a spanner. RenderStyle& style = descendant->style(); if (style.columnSpan() != ColumnSpanAll || !descendant->isBox() || descendant->isFloatingOrOutOfFlowPositioned())