Title: [174126] trunk/Source/WebCore
- Revision
- 174126
- Author
- [email protected]
- Date
- 2014-09-30 15:12:26 -0700 (Tue, 30 Sep 2014)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (174125 => 174126)
--- trunk/Source/WebCore/ChangeLog 2014-09-30 21:32:55 UTC (rev 174125)
+++ trunk/Source/WebCore/ChangeLog 2014-09-30 22:12:26 UTC (rev 174126)
@@ -1,3 +1,15 @@
+2014-09-30 David Hyatt <[email protected]>
+
+ 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-09-30 Christophe Dumez <[email protected]>
Generalize is<>() / downcast<>() support to all types
Modified: trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp (174125 => 174126)
--- trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2014-09-30 21:32:55 UTC (rev 174125)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2014-09-30 22:12:26 UTC (rev 174126)
@@ -245,8 +245,12 @@
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())
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
