| Index: Source/core/editing/DeleteSelectionCommand.h
|
| diff --git a/Source/core/editing/DeleteSelectionCommand.h b/Source/core/editing/DeleteSelectionCommand.h
|
| index 44d2f966f157f9752a40c0684560998ae8dc24e1..33da3fb5d5f9c607a6e03f426b41996b744fd1c5 100644
|
| --- a/Source/core/editing/DeleteSelectionCommand.h
|
| +++ b/Source/core/editing/DeleteSelectionCommand.h
|
| @@ -33,7 +33,7 @@ namespace blink {
|
| class EditingStyle;
|
| class HTMLTableRowElement;
|
|
|
| -class DeleteSelectionCommand FINAL : public CompositeEditCommand {
|
| +class DeleteSelectionCommand final : public CompositeEditCommand {
|
| public:
|
| static PassRefPtrWillBeRawPtr<DeleteSelectionCommand> create(Document& document, bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool expandForSpecialElements = false, bool sanitizeMarkup = true)
|
| {
|
| @@ -44,16 +44,16 @@ public:
|
| return adoptRefWillBeNoop(new DeleteSelectionCommand(selection, smartDelete, mergeBlocksAfterDelete, expandForSpecialElements, sanitizeMarkup));
|
| }
|
|
|
| - virtual void trace(Visitor*) OVERRIDE;
|
| + virtual void trace(Visitor*) override;
|
|
|
| private:
|
| DeleteSelectionCommand(Document&, bool smartDelete, bool mergeBlocksAfterDelete, bool expandForSpecialElements, bool santizeMarkup);
|
| DeleteSelectionCommand(const VisibleSelection&, bool smartDelete, bool mergeBlocksAfterDelete, bool expandForSpecialElements, bool sanitizeMarkup);
|
|
|
| - virtual void doApply() OVERRIDE;
|
| - virtual EditAction editingAction() const OVERRIDE;
|
| + virtual void doApply() override;
|
| + virtual EditAction editingAction() const override;
|
|
|
| - virtual bool preservesTypingStyle() const OVERRIDE;
|
| + virtual bool preservesTypingStyle() const override;
|
|
|
| void initializeStartEnd(Position&, Position&);
|
| void setStartingSelectionOnSmartDelete(const Position&, const Position&);
|
| @@ -67,8 +67,8 @@ private:
|
| void calculateTypingStyleAfterDelete();
|
| void clearTransientState();
|
| void makeStylingElementsDirectChildrenOfEditableRootToPreventStyleLoss();
|
| - virtual void removeNode(PassRefPtrWillBeRawPtr<Node>, ShouldAssumeContentIsAlwaysEditable = DoNotAssumeContentIsAlwaysEditable) OVERRIDE;
|
| - virtual void deleteTextFromNode(PassRefPtrWillBeRawPtr<Text>, unsigned, unsigned) OVERRIDE;
|
| + virtual void removeNode(PassRefPtrWillBeRawPtr<Node>, ShouldAssumeContentIsAlwaysEditable = DoNotAssumeContentIsAlwaysEditable) override;
|
| + virtual void deleteTextFromNode(PassRefPtrWillBeRawPtr<Text>, unsigned, unsigned) override;
|
| void removeRedundantBlocks();
|
|
|
| bool m_hasSelectionToDelete;
|
|
|