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

Side by Side Diff: Source/core/editing/InsertParagraphSeparatorCommand.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/InsertNodeBeforeCommand.h ('k') | Source/core/editing/InsertTextCommand.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 14 matching lines...) Expand all
25 25
26 #ifndef InsertParagraphSeparatorCommand_h 26 #ifndef InsertParagraphSeparatorCommand_h
27 #define InsertParagraphSeparatorCommand_h 27 #define InsertParagraphSeparatorCommand_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 34
35 class InsertParagraphSeparatorCommand FINAL : public CompositeEditCommand { 35 class InsertParagraphSeparatorCommand final : public CompositeEditCommand {
36 public: 36 public:
37 static PassRefPtrWillBeRawPtr<InsertParagraphSeparatorCommand> create(Docume nt& document, bool useDefaultParagraphElement = false, bool pasteBlockquoteIntoU nquotedArea = false) 37 static PassRefPtrWillBeRawPtr<InsertParagraphSeparatorCommand> create(Docume nt& document, bool useDefaultParagraphElement = false, bool pasteBlockquoteIntoU nquotedArea = false)
38 { 38 {
39 return adoptRefWillBeNoop(new InsertParagraphSeparatorCommand(document, useDefaultParagraphElement, pasteBlockquoteIntoUnquotedArea)); 39 return adoptRefWillBeNoop(new InsertParagraphSeparatorCommand(document, useDefaultParagraphElement, pasteBlockquoteIntoUnquotedArea));
40 } 40 }
41 41
42 virtual void trace(Visitor*) OVERRIDE; 42 virtual void trace(Visitor*) override;
43 43
44 private: 44 private:
45 InsertParagraphSeparatorCommand(Document&, bool useDefaultParagraphElement, bool pasteBlockquoteIntoUnquotedArea); 45 InsertParagraphSeparatorCommand(Document&, bool useDefaultParagraphElement, bool pasteBlockquoteIntoUnquotedArea);
46 46
47 virtual void doApply() OVERRIDE; 47 virtual void doApply() override;
48 48
49 void calculateStyleBeforeInsertion(const Position&); 49 void calculateStyleBeforeInsertion(const Position&);
50 void applyStyleAfterInsertion(Element* originalEnclosingBlock); 50 void applyStyleAfterInsertion(Element* originalEnclosingBlock);
51 void getAncestorsInsideBlock(const Node* insertionNode, Element* outerBlock, WillBeHeapVector<RefPtrWillBeMember<Element> >& ancestors); 51 void getAncestorsInsideBlock(const Node* insertionNode, Element* outerBlock, WillBeHeapVector<RefPtrWillBeMember<Element> >& ancestors);
52 PassRefPtrWillBeRawPtr<Element> cloneHierarchyUnderNewBlock(const WillBeHeap Vector<RefPtrWillBeMember<Element> >& ancestors, PassRefPtrWillBeRawPtr<Element> blockToInsert); 52 PassRefPtrWillBeRawPtr<Element> cloneHierarchyUnderNewBlock(const WillBeHeap Vector<RefPtrWillBeMember<Element> >& ancestors, PassRefPtrWillBeRawPtr<Element> blockToInsert);
53 53
54 bool shouldUseDefaultParagraphElement(Element*) const; 54 bool shouldUseDefaultParagraphElement(Element*) const;
55 55
56 virtual bool preservesTypingStyle() const OVERRIDE; 56 virtual bool preservesTypingStyle() const override;
57 57
58 RefPtrWillBeMember<EditingStyle> m_style; 58 RefPtrWillBeMember<EditingStyle> m_style;
59 59
60 bool m_mustUseDefaultParagraphElement; 60 bool m_mustUseDefaultParagraphElement;
61 bool m_pasteBlockquoteIntoUnquotedArea; 61 bool m_pasteBlockquoteIntoUnquotedArea;
62 }; 62 };
63 63
64 } 64 }
65 65
66 #endif 66 #endif
OLDNEW
« no previous file with comments | « Source/core/editing/InsertNodeBeforeCommand.h ('k') | Source/core/editing/InsertTextCommand.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698