| Index: third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp
|
| diff --git a/third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp b/third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp
|
| index 99e7fa1c01ed7fd1856ed73c3c8ec03bb662e96a..54d7988128edcbc881b95fe9172027d6e75279fb 100644
|
| --- a/third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp
|
| +++ b/third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp
|
| @@ -572,7 +572,7 @@ void ReplaceSelectionCommand::removeRedundantStylesAndKeepStyleSpanInline(Insert
|
| // FIXME: Tolerate differences in id, class, and style attributes.
|
| if (element->parentNode() && isNonTableCellHTMLBlockElement(element) && areIdenticalElements(*element, *element->parentNode())
|
| && VisiblePosition::firstPositionInNode(element->parentNode()).deepEquivalent() == VisiblePosition::firstPositionInNode(element).deepEquivalent()
|
| - && createVisiblePosition(lastPositionInNode(element->parentNode())).deepEquivalent() == createVisiblePosition(lastPositionInNode(element)).deepEquivalent()) {
|
| + && createVisiblePosition(Position::lastPositionInNode(element->parentNode())).deepEquivalent() == createVisiblePosition(Position::lastPositionInNode(element)).deepEquivalent()) {
|
| insertedNodes.willRemoveNodePreservingChildren(*element);
|
| removeNodePreservingChildren(element, editingState);
|
| if (editingState->isAborted())
|
| @@ -705,7 +705,7 @@ void ReplaceSelectionCommand::moveElementOutOfAncestor(Element* element, Element
|
| return;
|
|
|
| VisiblePosition positionAtEndOfNode = createVisiblePosition(lastPositionInOrAfterNode(element));
|
| - VisiblePosition lastPositionInParagraph = createVisiblePosition(lastPositionInNode(ancestor));
|
| + VisiblePosition lastPositionInParagraph = createVisiblePosition(Position::lastPositionInNode(ancestor));
|
| if (positionAtEndOfNode.deepEquivalent() == lastPositionInParagraph.deepEquivalent()) {
|
| removeNode(element, editingState);
|
| if (editingState->isAborted())
|
|
|