| Index: third_party/WebKit/Source/core/editing/commands/DeleteSelectionCommand.h
|
| diff --git a/third_party/WebKit/Source/core/editing/commands/DeleteSelectionCommand.h b/third_party/WebKit/Source/core/editing/commands/DeleteSelectionCommand.h
|
| index a87e80f8fca189994be3548cf68adc45e394f6e9..ca95f5125883cd910816b0e162e071fca9f7f258 100644
|
| --- a/third_party/WebKit/Source/core/editing/commands/DeleteSelectionCommand.h
|
| +++ b/third_party/WebKit/Source/core/editing/commands/DeleteSelectionCommand.h
|
| @@ -35,13 +35,13 @@ class HTMLTableRowElement;
|
|
|
| class DeleteSelectionCommand final : public CompositeEditCommand {
|
| public:
|
| - static PassRefPtrWillBeRawPtr<DeleteSelectionCommand> create(Document& document, bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool expandForSpecialElements = false, bool sanitizeMarkup = true)
|
| + static RawPtr<DeleteSelectionCommand> create(Document& document, bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool expandForSpecialElements = false, bool sanitizeMarkup = true)
|
| {
|
| - return adoptRefWillBeNoop(new DeleteSelectionCommand(document, smartDelete, mergeBlocksAfterDelete, expandForSpecialElements, sanitizeMarkup));
|
| + return new DeleteSelectionCommand(document, smartDelete, mergeBlocksAfterDelete, expandForSpecialElements, sanitizeMarkup);
|
| }
|
| - static PassRefPtrWillBeRawPtr<DeleteSelectionCommand> create(const VisibleSelection& selection, bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool expandForSpecialElements = false, bool sanitizeMarkup = true)
|
| + static RawPtr<DeleteSelectionCommand> create(const VisibleSelection& selection, bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool expandForSpecialElements = false, bool sanitizeMarkup = true)
|
| {
|
| - return adoptRefWillBeNoop(new DeleteSelectionCommand(selection, smartDelete, mergeBlocksAfterDelete, expandForSpecialElements, sanitizeMarkup));
|
| + return new DeleteSelectionCommand(selection, smartDelete, mergeBlocksAfterDelete, expandForSpecialElements, sanitizeMarkup);
|
| }
|
|
|
| DECLARE_VIRTUAL_TRACE();
|
| @@ -67,8 +67,8 @@ private:
|
| void calculateTypingStyleAfterDelete();
|
| void clearTransientState();
|
| void makeStylingElementsDirectChildrenOfEditableRootToPreventStyleLoss(EditingState*);
|
| - void removeNode(PassRefPtrWillBeRawPtr<Node>, EditingState*, ShouldAssumeContentIsAlwaysEditable = DoNotAssumeContentIsAlwaysEditable) override;
|
| - void deleteTextFromNode(PassRefPtrWillBeRawPtr<Text>, unsigned, unsigned) override;
|
| + void removeNode(RawPtr<Node>, EditingState*, ShouldAssumeContentIsAlwaysEditable = DoNotAssumeContentIsAlwaysEditable) override;
|
| + void deleteTextFromNode(RawPtr<Text>, unsigned, unsigned) override;
|
| void removeRedundantBlocks(EditingState*);
|
|
|
| bool m_hasSelectionToDelete;
|
| @@ -89,15 +89,15 @@ private:
|
| Position m_endingPosition;
|
| Position m_leadingWhitespace;
|
| Position m_trailingWhitespace;
|
| - RefPtrWillBeMember<Node> m_startBlock;
|
| - RefPtrWillBeMember<Node> m_endBlock;
|
| - RefPtrWillBeMember<EditingStyle> m_typingStyle;
|
| - RefPtrWillBeMember<EditingStyle> m_deleteIntoBlockquoteStyle;
|
| - RefPtrWillBeMember<Element> m_startRoot;
|
| - RefPtrWillBeMember<Element> m_endRoot;
|
| - RefPtrWillBeMember<HTMLTableRowElement> m_startTableRow;
|
| - RefPtrWillBeMember<HTMLTableRowElement> m_endTableRow;
|
| - RefPtrWillBeMember<Node> m_temporaryPlaceholder;
|
| + Member<Node> m_startBlock;
|
| + Member<Node> m_endBlock;
|
| + Member<EditingStyle> m_typingStyle;
|
| + Member<EditingStyle> m_deleteIntoBlockquoteStyle;
|
| + Member<Element> m_startRoot;
|
| + Member<Element> m_endRoot;
|
| + Member<HTMLTableRowElement> m_startTableRow;
|
| + Member<HTMLTableRowElement> m_endTableRow;
|
| + Member<Node> m_temporaryPlaceholder;
|
| };
|
|
|
| } // namespace blink
|
|
|