Index: Source/core/editing/CompositeEditCommand.cpp |
diff --git a/Source/core/editing/CompositeEditCommand.cpp b/Source/core/editing/CompositeEditCommand.cpp |
index 7485702169b85d935060ef09361dbc144ac548cd..79d0d6e9e9dbe0388d3e154163a65b3029ee3ea9 100644 |
--- a/Source/core/editing/CompositeEditCommand.cpp |
+++ b/Source/core/editing/CompositeEditCommand.cpp |
@@ -846,7 +846,7 @@ PassRefPtr<Node> CompositeEditCommand::insertBlockPlaceholder(const Position& po |
return 0; |
// Should assert isBlockFlow || isInlineFlow when deletion improves. See 4244964. |
- ASSERT(pos.deprecatedNode()->renderer()); |
+ ASSERT(pos.renderer()); |
RefPtr<Node> placeholder = createBlockPlaceholderElement(document()); |
insertNodeAt(placeholder, pos); |
@@ -927,7 +927,7 @@ PassRefPtr<Node> CompositeEditCommand::moveParagraphContentsToNewBlockIfNecessar |
if (upstreamStart.deprecatedNode() == editableRootForPosition(upstreamStart)) { |
// If the block is the root editable element and it contains no visible content, create a new |
// block but don't try and move content into it, since there's nothing for moveParagraphs to move. |
- if (!Position::hasRenderedNonAnonymousDescendantsWithHeight(upstreamStart.deprecatedNode()->renderer())) |
+ if (!Position::hasRenderedNonAnonymousDescendantsWithHeight(upstreamStart.renderer())) |
return insertNewDefaultParagraphElementAt(upstreamStart); |
} else if (isBlock(upstreamEnd.deprecatedNode())) { |
if (!upstreamEnd.deprecatedNode()->isDescendantOf(upstreamStart.deprecatedNode())) { |
@@ -1360,7 +1360,7 @@ bool CompositeEditCommand::breakOutOfEmptyMailBlockquotedParagraph() |
Position caretPos(caret.deepEquivalent().downstream()); |
// A line break is either a br or a preserved newline. |
- ASSERT(caretPos.deprecatedNode()->hasTagName(brTag) || (caretPos.deprecatedNode()->isTextNode() && caretPos.deprecatedNode()->renderer()->style()->preserveNewline())); |
+ ASSERT(caretPos.deprecatedNode()->hasTagName(brTag) || (caretPos.deprecatedNode()->isTextNode() && caretPos.renderer()->style()->preserveNewline())); |
if (caretPos.deprecatedNode()->hasTagName(brTag)) |
removeNodeAndPruneAncestors(caretPos.deprecatedNode()); |