| Index: Source/core/editing/DeleteSelectionCommand.cpp
|
| diff --git a/Source/core/editing/DeleteSelectionCommand.cpp b/Source/core/editing/DeleteSelectionCommand.cpp
|
| index e4951f808efd758f36a52561d06416a8df3c2c1a..6c06026b04c2aa4248f0d4a80732975565fe169c 100644
|
| --- a/Source/core/editing/DeleteSelectionCommand.cpp
|
| +++ b/Source/core/editing/DeleteSelectionCommand.cpp
|
| @@ -374,7 +374,7 @@ void DeleteSelectionCommand::removeNode(PassRefPtrWillBeRawPtr<Node> node, Shoul
|
|
|
| // Make sure empty cell has some height, if a placeholder can be inserted.
|
| document().updateLayoutIgnorePendingStylesheets();
|
| - LayoutObject* r = node->renderer();
|
| + LayoutObject* r = node->layoutObject();
|
| if (r && r->isTableCell() && toLayoutTableCell(r)->contentHeight() <= 0) {
|
| Position firstEditablePosition = firstEditablePositionInNode(node.get());
|
| if (firstEditablePosition.isNotNull())
|
| @@ -489,7 +489,7 @@ void DeleteSelectionCommand::handleGeneralDelete()
|
| }
|
|
|
| // The selection to delete is all in one node.
|
| - if (!startNode->renderer() || (!startOffset && m_downstreamEnd.atLastEditingPositionForNode()))
|
| + if (!startNode->layoutObject() || (!startOffset && m_downstreamEnd.atLastEditingPositionForNode()))
|
| removeNode(startNode);
|
| }
|
| else {
|
| @@ -574,12 +574,12 @@ void DeleteSelectionCommand::fixupWhitespace()
|
| // FIXME: isRenderedCharacter should be removed, and we should use VisiblePosition::characterAfter and VisiblePosition::characterBefore
|
| if (m_leadingWhitespace.isNotNull() && !m_leadingWhitespace.isRenderedCharacter() && m_leadingWhitespace.deprecatedNode()->isTextNode()) {
|
| Text* textNode = toText(m_leadingWhitespace.deprecatedNode());
|
| - ASSERT(!textNode->renderer() || textNode->renderer()->style()->collapseWhiteSpace());
|
| + ASSERT(!textNode->layoutObject() || textNode->layoutObject()->style()->collapseWhiteSpace());
|
| replaceTextInNodePreservingMarkers(textNode, m_leadingWhitespace.deprecatedEditingOffset(), 1, nonBreakingSpaceString());
|
| }
|
| if (m_trailingWhitespace.isNotNull() && !m_trailingWhitespace.isRenderedCharacter() && m_trailingWhitespace.deprecatedNode()->isTextNode()) {
|
| Text* textNode = toText(m_trailingWhitespace.deprecatedNode());
|
| - ASSERT(!textNode->renderer() ||textNode->renderer()->style()->collapseWhiteSpace());
|
| + ASSERT(!textNode->layoutObject() || textNode->layoutObject()->style()->collapseWhiteSpace());
|
| replaceTextInNodePreservingMarkers(textNode, m_trailingWhitespace.deprecatedEditingOffset(), 1, nonBreakingSpaceString());
|
| }
|
| }
|
|
|