Title: [153008] branches/safari-537-branch/Source/WebCore
- Revision
- 153008
- Author
- [email protected]
- Date
- 2013-07-22 15:33:15 -0700 (Mon, 22 Jul 2013)
Log Message
Merged r152858. <rdar://problem/14480588>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (153007 => 153008)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-22 22:29:03 UTC (rev 153007)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-22 22:33:15 UTC (rev 153008)
@@ -1,5 +1,22 @@
2013-07-22 Lucas Forschler <[email protected]>
+ Merge r152858
+
+ 2013-07-18 Antoine Quint <[email protected]>
+
+ Crash in WebCore::createMarkup()
+ https://bugs.webkit.org/show_bug.cgi?id=118847
+
+ Reviewed by Ryosuke Niwa.
+
+ Also check that we have a containingBlock() for the renderer() so that we
+ may safely call node() on it.
+
+ * editing/markup.cpp:
+ (WebCore::highestAncestorToWrapMarkup):
+
+2013-07-22 Lucas Forschler <[email protected]>
+
Merge r152839
2013-07-18 Ryosuke Niwa <[email protected]>
Modified: branches/safari-537-branch/Source/WebCore/editing/markup.cpp (153007 => 153008)
--- branches/safari-537-branch/Source/WebCore/editing/markup.cpp 2013-07-22 22:29:03 UTC (rev 153007)
+++ branches/safari-537-branch/Source/WebCore/editing/markup.cpp 2013-07-22 22:33:15 UTC (rev 153008)
@@ -527,7 +527,7 @@
}
Node* checkAncestor = specialCommonAncestor ? specialCommonAncestor : commonAncestor;
- if (checkAncestor->renderer()) {
+ if (checkAncestor->renderer() && checkAncestor->renderer()->containingBlock()) {
Node* newSpecialCommonAncestor = highestEnclosingNodeOfType(firstPositionInNode(checkAncestor), &isElementPresentational, CanCrossEditingBoundary, checkAncestor->renderer()->containingBlock()->node());
if (newSpecialCommonAncestor)
specialCommonAncestor = newSpecialCommonAncestor;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes