| Index: third_party/WebKit/Source/core/editing/commands/DeleteSelectionCommand.cpp
|
| diff --git a/third_party/WebKit/Source/core/editing/commands/DeleteSelectionCommand.cpp b/third_party/WebKit/Source/core/editing/commands/DeleteSelectionCommand.cpp
|
| index a577a52f6414b9d0c5de99e4a4e21098116afa51..5fdb3581b323048161262eb782897fcc9869dbcd 100644
|
| --- a/third_party/WebKit/Source/core/editing/commands/DeleteSelectionCommand.cpp
|
| +++ b/third_party/WebKit/Source/core/editing/commands/DeleteSelectionCommand.cpp
|
| @@ -338,7 +338,7 @@ static Position firstEditablePositionInNode(Node* node)
|
| return next ? firstPositionInOrBeforeNode(next) : Position();
|
| }
|
|
|
| -void DeleteSelectionCommand::removeNode(PassRefPtrWillBeRawPtr<Node> node, ShouldAssumeContentIsAlwaysEditable shouldAssumeContentIsAlwaysEditable)
|
| +void DeleteSelectionCommand::removeNode(RawPtr<Node> node, ShouldAssumeContentIsAlwaysEditable shouldAssumeContentIsAlwaysEditable)
|
| {
|
| if (!node)
|
| return;
|
| @@ -350,9 +350,9 @@ void DeleteSelectionCommand::removeNode(PassRefPtrWillBeRawPtr<Node> node, Shoul
|
| if (!node->hasChildren())
|
| return;
|
| // Search this non-editable region for editable regions to empty.
|
| - RefPtrWillBeRawPtr<Node> child = node->firstChild();
|
| + RawPtr<Node> child = node->firstChild();
|
| while (child) {
|
| - RefPtrWillBeRawPtr<Node> nextChild = child->nextSibling();
|
| + RawPtr<Node> nextChild = child->nextSibling();
|
| removeNode(child.get(), shouldAssumeContentIsAlwaysEditable);
|
| // Bail if nextChild is no longer node's child.
|
| if (nextChild && nextChild->parentNode() != node)
|
| @@ -416,7 +416,7 @@ static void updatePositionForTextRemoval(Text* node, int offset, int count, Posi
|
| position = Position(position.computeContainerNode(), offset);
|
| }
|
|
|
| -void DeleteSelectionCommand::deleteTextFromNode(PassRefPtrWillBeRawPtr<Text> node, unsigned offset, unsigned count)
|
| +void DeleteSelectionCommand::deleteTextFromNode(RawPtr<Text> node, unsigned offset, unsigned count)
|
| {
|
| // FIXME: Update the endpoints of the range being deleted.
|
| updatePositionForTextRemoval(node.get(), offset, count, m_endingPosition);
|
| @@ -429,13 +429,13 @@ void DeleteSelectionCommand::deleteTextFromNode(PassRefPtrWillBeRawPtr<Text> nod
|
|
|
| void DeleteSelectionCommand::makeStylingElementsDirectChildrenOfEditableRootToPreventStyleLoss()
|
| {
|
| - RefPtrWillBeRawPtr<Range> range = createRange(m_selectionToDelete.toNormalizedEphemeralRange());
|
| - RefPtrWillBeRawPtr<Node> node = range->firstNode();
|
| + RawPtr<Range> range = createRange(m_selectionToDelete.toNormalizedEphemeralRange());
|
| + RawPtr<Node> node = range->firstNode();
|
| while (node && node != range->pastLastNode()) {
|
| - RefPtrWillBeRawPtr<Node> nextNode = NodeTraversal::next(*node);
|
| + RawPtr<Node> nextNode = NodeTraversal::next(*node);
|
| if (isHTMLStyleElement(*node) || isHTMLLinkElement(*node)) {
|
| nextNode = NodeTraversal::nextSkippingChildren(*node);
|
| - RefPtrWillBeRawPtr<Element> rootEditableElement = node->rootEditableElement();
|
| + RawPtr<Element> rootEditableElement = node->rootEditableElement();
|
| if (rootEditableElement.get()) {
|
| removeNode(node);
|
| appendNode(node, rootEditableElement);
|
| @@ -497,7 +497,7 @@ void DeleteSelectionCommand::handleGeneralDelete()
|
| } else {
|
| bool startNodeWasDescendantOfEndNode = m_upstreamStart.anchorNode()->isDescendantOf(m_downstreamEnd.anchorNode());
|
| // The selection to delete spans more than one node.
|
| - RefPtrWillBeRawPtr<Node> node(startNode);
|
| + RawPtr<Node> node(startNode);
|
|
|
| if (startOffset > 0) {
|
| if (startNode->isTextNode()) {
|
| @@ -519,7 +519,7 @@ void DeleteSelectionCommand::handleGeneralDelete()
|
| // NodeTraversal::nextSkippingChildren just blew past the end position, so stop deleting
|
| node = nullptr;
|
| } else if (!m_downstreamEnd.anchorNode()->isDescendantOf(node.get())) {
|
| - RefPtrWillBeRawPtr<Node> nextNode = NodeTraversal::nextSkippingChildren(*node);
|
| + RawPtr<Node> nextNode = NodeTraversal::nextSkippingChildren(*node);
|
| // if we just removed a node from the end container, update end position so the
|
| // check above will work
|
| updatePositionForNodeRemoval(m_downstreamEnd, *node);
|
| @@ -687,7 +687,7 @@ void DeleteSelectionCommand::removePreviouslySelectedEmptyTableRows()
|
| if (m_endTableRow && m_endTableRow->inDocument() && m_endTableRow != m_startTableRow) {
|
| Node* row = m_endTableRow->previousSibling();
|
| while (row && row != m_startTableRow) {
|
| - RefPtrWillBeRawPtr<Node> previousRow = row->previousSibling();
|
| + RawPtr<Node> previousRow = row->previousSibling();
|
| if (isTableRowEmpty(row)) {
|
| // Use a raw removeNode, instead of DeleteSelectionCommand's,
|
| // because that won't remove rows, it only empties them in
|
| @@ -702,7 +702,7 @@ void DeleteSelectionCommand::removePreviouslySelectedEmptyTableRows()
|
| if (m_startTableRow && m_startTableRow->inDocument() && m_startTableRow != m_endTableRow) {
|
| Node* row = m_startTableRow->nextSibling();
|
| while (row && row != m_endTableRow) {
|
| - RefPtrWillBeRawPtr<Node> nextRow = row->nextSibling();
|
| + RawPtr<Node> nextRow = row->nextSibling();
|
| if (isTableRowEmpty(row))
|
| CompositeEditCommand::removeNode(row);
|
| row = nextRow.get();
|
| @@ -852,7 +852,7 @@ void DeleteSelectionCommand::doApply()
|
| m_needPlaceholder = hasPlaceholder && lineBreakBeforeStart && !lineBreakAtEndOfSelectionToDelete;
|
| }
|
|
|
| - RefPtrWillBeRawPtr<HTMLBRElement> placeholder = m_needPlaceholder ? HTMLBRElement::create(document()) : nullptr;
|
| + RawPtr<HTMLBRElement> placeholder = m_needPlaceholder ? HTMLBRElement::create(document()) : nullptr;
|
|
|
| if (placeholder) {
|
| if (m_sanitizeMarkup)
|
|
|