Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(245)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: Source/core/editing/DeleteSelectionCommand.h

Issue 616603006: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/editing (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased the patch Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/editing/DeleteFromTextNodeCommand.h ('k') | Source/core/editing/EditCommand.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2005, 2006, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2005, 2006, 2008 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 15 matching lines...) Expand all
26 #ifndef DeleteSelectionCommand_h 26 #ifndef DeleteSelectionCommand_h
27 #define DeleteSelectionCommand_h 27 #define DeleteSelectionCommand_h
28 28
29 #include "core/editing/CompositeEditCommand.h" 29 #include "core/editing/CompositeEditCommand.h"
30 30
31 namespace blink { 31 namespace blink {
32 32
33 class EditingStyle; 33 class EditingStyle;
34 class HTMLTableRowElement; 34 class HTMLTableRowElement;
35 35
36 class DeleteSelectionCommand FINAL : public CompositeEditCommand { 36 class DeleteSelectionCommand final : public CompositeEditCommand {
37 public: 37 public:
38 static PassRefPtrWillBeRawPtr<DeleteSelectionCommand> create(Document& docum ent, bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool expandFo rSpecialElements = false, bool sanitizeMarkup = true) 38 static PassRefPtrWillBeRawPtr<DeleteSelectionCommand> create(Document& docum ent, bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool expandFo rSpecialElements = false, bool sanitizeMarkup = true)
39 { 39 {
40 return adoptRefWillBeNoop(new DeleteSelectionCommand(document, smartDele te, mergeBlocksAfterDelete, expandForSpecialElements, sanitizeMarkup)); 40 return adoptRefWillBeNoop(new DeleteSelectionCommand(document, smartDele te, mergeBlocksAfterDelete, expandForSpecialElements, sanitizeMarkup));
41 } 41 }
42 static PassRefPtrWillBeRawPtr<DeleteSelectionCommand> create(const VisibleSe lection& selection, bool smartDelete = false, bool mergeBlocksAfterDelete = true , bool expandForSpecialElements = false, bool sanitizeMarkup = true) 42 static PassRefPtrWillBeRawPtr<DeleteSelectionCommand> create(const VisibleSe lection& selection, bool smartDelete = false, bool mergeBlocksAfterDelete = true , bool expandForSpecialElements = false, bool sanitizeMarkup = true)
43 { 43 {
44 return adoptRefWillBeNoop(new DeleteSelectionCommand(selection, smartDel ete, mergeBlocksAfterDelete, expandForSpecialElements, sanitizeMarkup)); 44 return adoptRefWillBeNoop(new DeleteSelectionCommand(selection, smartDel ete, mergeBlocksAfterDelete, expandForSpecialElements, sanitizeMarkup));
45 } 45 }
46 46
47 virtual void trace(Visitor*) OVERRIDE; 47 virtual void trace(Visitor*) override;
48 48
49 private: 49 private:
50 DeleteSelectionCommand(Document&, bool smartDelete, bool mergeBlocksAfterDel ete, bool expandForSpecialElements, bool santizeMarkup); 50 DeleteSelectionCommand(Document&, bool smartDelete, bool mergeBlocksAfterDel ete, bool expandForSpecialElements, bool santizeMarkup);
51 DeleteSelectionCommand(const VisibleSelection&, bool smartDelete, bool merge BlocksAfterDelete, bool expandForSpecialElements, bool sanitizeMarkup); 51 DeleteSelectionCommand(const VisibleSelection&, bool smartDelete, bool merge BlocksAfterDelete, bool expandForSpecialElements, bool sanitizeMarkup);
52 52
53 virtual void doApply() OVERRIDE; 53 virtual void doApply() override;
54 virtual EditAction editingAction() const OVERRIDE; 54 virtual EditAction editingAction() const override;
55 55
56 virtual bool preservesTypingStyle() const OVERRIDE; 56 virtual bool preservesTypingStyle() const override;
57 57
58 void initializeStartEnd(Position&, Position&); 58 void initializeStartEnd(Position&, Position&);
59 void setStartingSelectionOnSmartDelete(const Position&, const Position&); 59 void setStartingSelectionOnSmartDelete(const Position&, const Position&);
60 void initializePositionData(); 60 void initializePositionData();
61 void saveTypingStyleState(); 61 void saveTypingStyleState();
62 bool handleSpecialCaseBRDelete(); 62 bool handleSpecialCaseBRDelete();
63 void handleGeneralDelete(); 63 void handleGeneralDelete();
64 void fixupWhitespace(); 64 void fixupWhitespace();
65 void mergeParagraphs(); 65 void mergeParagraphs();
66 void removePreviouslySelectedEmptyTableRows(); 66 void removePreviouslySelectedEmptyTableRows();
67 void calculateTypingStyleAfterDelete(); 67 void calculateTypingStyleAfterDelete();
68 void clearTransientState(); 68 void clearTransientState();
69 void makeStylingElementsDirectChildrenOfEditableRootToPreventStyleLoss(); 69 void makeStylingElementsDirectChildrenOfEditableRootToPreventStyleLoss();
70 virtual void removeNode(PassRefPtrWillBeRawPtr<Node>, ShouldAssumeContentIsA lwaysEditable = DoNotAssumeContentIsAlwaysEditable) OVERRIDE; 70 virtual void removeNode(PassRefPtrWillBeRawPtr<Node>, ShouldAssumeContentIsA lwaysEditable = DoNotAssumeContentIsAlwaysEditable) override;
71 virtual void deleteTextFromNode(PassRefPtrWillBeRawPtr<Text>, unsigned, unsi gned) OVERRIDE; 71 virtual void deleteTextFromNode(PassRefPtrWillBeRawPtr<Text>, unsigned, unsi gned) override;
72 void removeRedundantBlocks(); 72 void removeRedundantBlocks();
73 73
74 bool m_hasSelectionToDelete; 74 bool m_hasSelectionToDelete;
75 bool m_smartDelete; 75 bool m_smartDelete;
76 bool m_mergeBlocksAfterDelete; 76 bool m_mergeBlocksAfterDelete;
77 bool m_needPlaceholder; 77 bool m_needPlaceholder;
78 bool m_expandForSpecialElements; 78 bool m_expandForSpecialElements;
79 bool m_pruneStartBlockIfNecessary; 79 bool m_pruneStartBlockIfNecessary;
80 bool m_startsAtEmptyLine; 80 bool m_startsAtEmptyLine;
81 bool m_sanitizeMarkup; 81 bool m_sanitizeMarkup;
(...skipping 14 matching lines...) Expand all
96 RefPtrWillBeMember<Element> m_startRoot; 96 RefPtrWillBeMember<Element> m_startRoot;
97 RefPtrWillBeMember<Element> m_endRoot; 97 RefPtrWillBeMember<Element> m_endRoot;
98 RefPtrWillBeMember<HTMLTableRowElement> m_startTableRow; 98 RefPtrWillBeMember<HTMLTableRowElement> m_startTableRow;
99 RefPtrWillBeMember<HTMLTableRowElement> m_endTableRow; 99 RefPtrWillBeMember<HTMLTableRowElement> m_endTableRow;
100 RefPtrWillBeMember<Node> m_temporaryPlaceholder; 100 RefPtrWillBeMember<Node> m_temporaryPlaceholder;
101 }; 101 };
102 102
103 } // namespace blink 103 } // namespace blink
104 104
105 #endif // DeleteSelectionCommand_h 105 #endif // DeleteSelectionCommand_h
OLDNEW
« no previous file with comments | « Source/core/editing/DeleteFromTextNodeCommand.h ('k') | Source/core/editing/EditCommand.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698