Title: [176735] branches/safari-600.3-branch/Source/WebCore
- Revision
- 176735
- Author
- [email protected]
- Date
- 2014-12-03 12:10:54 -0800 (Wed, 03 Dec 2014)
Log Message
Fix merge-related build failure. rdar://problem/19122588
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (176734 => 176735)
--- branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-12-03 20:03:06 UTC (rev 176734)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-12-03 20:10:54 UTC (rev 176735)
@@ -1,5 +1,12 @@
2014-12-03 Dana Burkart <[email protected]>
+ Fix merge-related build failure.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::blockSelectionGaps):
+
+2014-12-03 Dana Burkart <[email protected]>
+
Merge r176295. <rdar://problem/19122588>
2014-11-18 David Hyatt <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebCore/rendering/RenderBlock.cpp (176734 => 176735)
--- branches/safari-600.3-branch/Source/WebCore/rendering/RenderBlock.cpp 2014-12-03 20:03:06 UTC (rev 176734)
+++ branches/safari-600.3-branch/Source/WebCore/rendering/RenderBlock.cpp 2014-12-03 20:10:54 UTC (rev 176735)
@@ -2039,7 +2039,7 @@
lastLogicalTop = blockDirectionOffset(rootBlock, offsetFromRootBlock) + curr->logicalBottom();
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()),
lastLogicalTop, lastLogicalLeft, lastLogicalRight, childCache, paintInfo));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
