Title: [180522] branches/safari-600.5-branch/Source/WebCore
- Revision
- 180522
- Author
- [email protected]
- Date
- 2015-02-23 15:04:33 -0800 (Mon, 23 Feb 2015)
Log Message
Follow-up merge for r179877. rdar://problem/19871003
Modified Paths
Diff
Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (180521 => 180522)
--- branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-02-23 22:46:59 UTC (rev 180521)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-02-23 23:04:33 UTC (rev 180522)
@@ -1,3 +1,7 @@
+2015-02-23 Babak Shafiei <[email protected]>
+
+ Follow-up merge for r179877.
+
2015-02-20 Dana Burkart <[email protected]>
Merged r180087. <rdar://problem/19850762>
Modified: branches/safari-600.5-branch/Source/WebCore/rendering/RenderBlock.cpp (180521 => 180522)
--- branches/safari-600.5-branch/Source/WebCore/rendering/RenderBlock.cpp 2015-02-23 22:46:59 UTC (rev 180521)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/RenderBlock.cpp 2015-02-23 23:04:33 UTC (rev 180522)
@@ -759,7 +759,7 @@
RenderObject* nextSibling = child->nextSibling();
if (auto* childFlowThread = child->flowThreadContainingBlock())
- toRenderNamedFlowThread(childFlowThread)->removeFlowChildInfo(child);
+ childFlowThread->removeFlowChildInfo(child);
parent->removeChildInternal(*child, child->hasLayer() ? NotifyChildren : DontNotifyChildren);
child->moveAllChildrenTo(parent, nextSibling, child->hasLayer());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
