Title: [177067] branches/safari-600.1.4.13-branch/Source/WebCore
- Revision
- 177067
- Author
- [email protected]
- Date
- 2014-12-10 09:02:48 -0800 (Wed, 10 Dec 2014)
Log Message
Merged r176735. rdar://problem/19132009
Modified Paths
Diff
Modified: branches/safari-600.1.4.13-branch/Source/WebCore/ChangeLog (177066 => 177067)
--- branches/safari-600.1.4.13-branch/Source/WebCore/ChangeLog 2014-12-10 17:01:45 UTC (rev 177066)
+++ branches/safari-600.1.4.13-branch/Source/WebCore/ChangeLog 2014-12-10 17:02:48 UTC (rev 177067)
@@ -1,5 +1,16 @@
2014-12-10 Babak Shafiei <[email protected]>
+ Merge r176735.
+
+ 2014-12-03 Dana Burkart <[email protected]>
+
+ Fix merge-related build failure.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::blockSelectionGaps):
+
+2014-12-10 Babak Shafiei <[email protected]>
+
Merge r176295.
2014-11-18 David Hyatt <[email protected]>
Modified: branches/safari-600.1.4.13-branch/Source/WebCore/rendering/RenderBlock.cpp (177066 => 177067)
--- branches/safari-600.1.4.13-branch/Source/WebCore/rendering/RenderBlock.cpp 2014-12-10 17:01:45 UTC (rev 177066)
+++ branches/safari-600.1.4.13-branch/Source/WebCore/rendering/RenderBlock.cpp 2014-12-10 17:02:48 UTC (rev 177067)
@@ -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
