Changeset 176735 in webkit

Timestamp:

Dec 3, 2014, 12:10:54 PM (12 years ago)

Author:

dburkart@apple.com

Message:

Fix merge-related build failure. rdar://problem/19122588

Location:

branches/safari-600.3-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (1 diff)

branches/safari-600.3-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2014-12-03  Dana Burkart  <dburkart@apple.com>
+
+        Fix merge-related build failure.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::blockSelectionGaps):
+
 2014-12-03  Dana Burkart  <dburkart@apple.com>
 

branches/safari-600.3-branch/Source/WebCore/rendering/RenderBlock.cpp

@@ -2040 +2040 @@
             lastLogicalLeft = logicalLeftSelectionOffset(rootBlock, curr->logicalBottom(), cache);
             lastLogicalRight = logicalRightSelectionOffset(rootBlock, curr->logicalBottom(), cache);
-        } else if (childState != SelectionNone && is<RenderBlock>(*curr)) {
+        } 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()),