From c58b6b265aa9aca56296a4c1199521fe4ab3cb70 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Thu, 12 Apr 2012 15:52:31 +0100 Subject: Add RenderObject::isBeforeOrAfterContent() from r94543 as a prerequisite for r105769 See http://trac.webkit.org/changeset/94543 Bug: 6329129 Change-Id: I02da7a9f891a6eec394398529f64b0992cbfce70 --- Source/WebCore/rendering/RenderObject.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Source/WebCore') diff --git a/Source/WebCore/rendering/RenderObject.h b/Source/WebCore/rendering/RenderObject.h index 005c453..f5fe562 100644 --- a/Source/WebCore/rendering/RenderObject.h +++ b/Source/WebCore/rendering/RenderObject.h @@ -312,6 +312,7 @@ public: inline bool isBeforeContent() const; inline bool isAfterContent() const; + inline bool isBeforeOrAfterContent() const; static inline bool isBeforeContent(const RenderObject* obj) { return obj && obj->isBeforeContent(); } static inline bool isAfterContent(const RenderObject* obj) { return obj && obj->isAfterContent(); } @@ -917,6 +918,11 @@ inline bool RenderObject::isAfterContent() const return true; } +inline bool RenderObject::isBeforeOrAfterContent() const +{ + return isBeforeContent() || isAfterContent(); +} + inline void RenderObject::setNeedsLayout(bool b, bool markParents) { bool alreadyNeededLayout = m_needsLayout; -- cgit v1.1 From b52229f8ad5e8b3632305005e437104c11eba942 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Thu, 12 Apr 2012 15:14:27 +0100 Subject: Cherry-pick WebKit change r105769 to fix a LayoutTest crash fast/multicol/clone-block-children-inline-mismatch-crash.html See http://trac.webkit.org/changeset/105769 Bug: 6329129 Change-Id: Ia48c7e50adb7de3fc1e897a0de90b62a1ca63786 --- Source/WebCore/rendering/RenderBlock.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Source/WebCore') diff --git a/Source/WebCore/rendering/RenderBlock.cpp b/Source/WebCore/rendering/RenderBlock.cpp index 42d68a0..5cef4cf 100644 --- a/Source/WebCore/rendering/RenderBlock.cpp +++ b/Source/WebCore/rendering/RenderBlock.cpp @@ -443,6 +443,8 @@ RenderBlock* RenderBlock::clone() const else { cloneBlock = new (renderArena()) RenderBlock(node()); cloneBlock->setStyle(style()); + if (!childrenInline() && cloneBlock->firstChild() && cloneBlock->firstChild()->isInline()) + cloneBlock->makeChildrenNonInline(); } cloneBlock->setChildrenInline(childrenInline()); return cloneBlock; @@ -657,8 +659,8 @@ RenderBlock* RenderBlock::columnsBlockForSpanningElement(RenderObject* newChild) // cross the streams and have to cope with both types of continuations mixed together). // This function currently supports (1) and (2). RenderBlock* columnsBlockAncestor = 0; - if (!newChild->isText() && newChild->style()->columnSpan() && !newChild->isFloatingOrPositioned() - && !newChild->isInline() && !isAnonymousColumnSpanBlock()) { + if (!newChild->isText() && newChild->style()->columnSpan() && !newChild->isBeforeOrAfterContent() + && !newChild->isFloatingOrPositioned() && !newChild->isInline() && !isAnonymousColumnSpanBlock()) { if (style()->specifiesColumns()) columnsBlockAncestor = this; else if (parent() && parent()->isRenderBlock()) -- cgit v1.1