From: Carlos Garcia Campos Date: Fri, 6 Mar 2015 07:33:11 +0000 (+0000) Subject: Fix invalid cast in WebCore::RenderBlock::blockSelectionGaps X-Git-Tag: archive/raspbian/2.14.3-1+rpi1~1^2^2^2~11 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8ce0564a251122e1fcc213175d291fc835a1ddac;p=webkit2gtk.git Fix invalid cast in WebCore::RenderBlock::blockSelectionGaps =================================================================== Gbp-Pq: Name render-block-cast.patch --- diff --git a/Source/WebCore/rendering/RenderBlock.cpp b/Source/WebCore/rendering/RenderBlock.cpp index e495c1837f..a3096410ef 100644 --- a/Source/WebCore/rendering/RenderBlock.cpp +++ b/Source/WebCore/rendering/RenderBlock.cpp @@ -2040,7 +2040,7 @@ GapRects RenderBlock::blockSelectionGaps(RenderBlock& rootBlock, const LayoutPoi lastLogicalTop = blockDirectionOffset(rootBlock, offsetFromRootBlock) + curr->logicalBottom(); lastLogicalLeft = logicalLeftSelectionOffset(rootBlock, curr->logicalBottom(), cache); lastLogicalRight = logicalRightSelectionOffset(rootBlock, curr->logicalBottom(), cache); - } else if (childState != SelectionNone) { + } else if (childState != SelectionNone && curr->isRenderBlock()) { // We must be a block that has some selected object inside it. Go ahead and recur. result.unite(toRenderBlock(curr)->selectionGaps(rootBlock, rootBlockPhysicalPosition, LayoutSize(offsetFromRootBlock.width() + curr->x(), offsetFromRootBlock.height() + curr->y()), lastLogicalTop, lastLogicalLeft, lastLogicalRight, childCache, paintInfo));