| Index: Source/core/editing/InsertParagraphSeparatorCommand.cpp
|
| diff --git a/Source/core/editing/InsertParagraphSeparatorCommand.cpp b/Source/core/editing/InsertParagraphSeparatorCommand.cpp
|
| index d250be62107666af6037e0dd78771a7414aa0d66..9a058dc4103e38da7cce2bb09d6ac24efe6a7a7f 100644
|
| --- a/Source/core/editing/InsertParagraphSeparatorCommand.cpp
|
| +++ b/Source/core/editing/InsertParagraphSeparatorCommand.cpp
|
| @@ -319,7 +319,7 @@ void InsertParagraphSeparatorCommand::doApply()
|
| insertionPosition = positionInParentAfterNode(*br);
|
| // If the insertion point is a break element, there is nothing else
|
| // we need to do.
|
| - if (visiblePos.deepEquivalent().anchorNode()->renderer()->isBR()) {
|
| + if (visiblePos.deepEquivalent().anchorNode()->layoutObject()->isBR()) {
|
| setEndingSelection(VisibleSelection(insertionPosition, DOWNSTREAM, endingSelection().isDirectional()));
|
| return;
|
| }
|
| @@ -350,7 +350,7 @@ void InsertParagraphSeparatorCommand::doApply()
|
| // after the preserved newline, causing the newline to be turned into a nbsp.
|
| if (leadingWhitespace.isNotNull() && leadingWhitespace.deprecatedNode()->isTextNode()) {
|
| Text* textNode = toText(leadingWhitespace.deprecatedNode());
|
| - ASSERT(!textNode->renderer() || textNode->renderer()->style()->collapseWhiteSpace());
|
| + ASSERT(!textNode->layoutObject() || textNode->layoutObject()->style()->collapseWhiteSpace());
|
| replaceTextInNodePreservingMarkers(textNode, leadingWhitespace.deprecatedEditingOffset(), 1, nonBreakingSpaceString());
|
| }
|
|
|
| @@ -417,7 +417,7 @@ void InsertParagraphSeparatorCommand::doApply()
|
| document().updateLayoutIgnorePendingStylesheets();
|
| if (!positionAfterSplit.isRenderedCharacter()) {
|
| // Clear out all whitespace and insert one non-breaking space
|
| - ASSERT(!positionAfterSplit.containerNode()->renderer() || positionAfterSplit.containerNode()->renderer()->style()->collapseWhiteSpace());
|
| + ASSERT(!positionAfterSplit.containerNode()->layoutObject() || positionAfterSplit.containerNode()->layoutObject()->style()->collapseWhiteSpace());
|
| deleteInsignificantTextDownstream(positionAfterSplit);
|
| if (positionAfterSplit.deprecatedNode()->isTextNode())
|
| insertTextIntoNode(toText(positionAfterSplit.containerNode()), 0, nonBreakingSpaceString());
|
|
|