Chromium Code Reviews| Index: Source/core/editing/ReplaceSelectionCommand.h |
| diff --git a/Source/core/editing/ReplaceSelectionCommand.h b/Source/core/editing/ReplaceSelectionCommand.h |
| index 070b0090e9e03f7168f584c007e996790248903a..a45675295c7c6e88690dbb249f551085a07a769a 100644 |
| --- a/Source/core/editing/ReplaceSelectionCommand.h |
| +++ b/Source/core/editing/ReplaceSelectionCommand.h |
| @@ -47,11 +47,13 @@ public: |
| typedef unsigned CommandOptions; |
| - static PassRefPtr<ReplaceSelectionCommand> create(Document& document, PassRefPtrWillBeRawPtr<DocumentFragment> fragment, CommandOptions options, EditAction action = EditActionPaste) |
| + static PassRefPtrWillBeRawPtr<ReplaceSelectionCommand> create(Document& document, PassRefPtrWillBeRawPtr<DocumentFragment> fragment, CommandOptions options, EditAction action = EditActionPaste) |
| { |
| - return adoptRef(new ReplaceSelectionCommand(document, fragment, options, action)); |
| + return adoptRefWillBeNoop(new ReplaceSelectionCommand(document, fragment, options, action)); |
| } |
| + virtual void trace(Visitor*) OVERRIDE; |
| + |
| private: |
| ReplaceSelectionCommand(Document&, PassRefPtrWillBeRawPtr<DocumentFragment>, CommandOptions, EditAction); |
| @@ -59,6 +61,7 @@ private: |
| virtual EditAction editingAction() const OVERRIDE; |
| class InsertedNodes { |
| + STACK_ALLOCATED(); |
| public: |
| void respondToNodeInsertion(Node&); |
| void willRemoveNodePreservingChildren(Node&); |
| @@ -70,8 +73,8 @@ private: |
| Node* pastLastLeaf() const { return m_lastNodeInserted ? NodeTraversal::next(m_lastNodeInserted->lastDescendantOrSelf()) : 0; } |
| private: |
| - RefPtr<Node> m_firstNodeInserted; |
| - RefPtr<Node> m_lastNodeInserted; |
| + RefPtrWillBeMember<Node> m_firstNodeInserted; |
| + RefPtrWillBeMember<Node> m_lastNodeInserted; |
| }; |
| Node* insertAsListItems(PassRefPtrWillBeRawPtr<HTMLElement> listElement, Node* insertionNode, const Position&, InsertedNodes&); |
| @@ -89,7 +92,7 @@ private: |
| void removeRedundantStylesAndKeepStyleSpanInline(InsertedNodes&); |
| void makeInsertedContentRoundTrippableWithHTMLTreeBuilder(const InsertedNodes&); |
| - void moveNodeOutOfAncestor(PassRefPtr<Node>, PassRefPtr<Node> ancestor); |
| + void moveNodeOutOfAncestor(PassRefPtrWillBeRawPtr<Node>, PassRefPtrWillBeRawPtr<Node> ancestor); |
| void handleStyleSpans(InsertedNodes&); |
| VisiblePosition positionAtStartOfInsertedContent() const; |
| @@ -104,11 +107,11 @@ private: |
| Position m_startOfInsertedContent; |
| Position m_endOfInsertedContent; |
|
haraken
2014/05/26 02:36:12
These Positions should be traced.
sof
2014/05/28 08:31:35
All done now.
|
| - RefPtr<EditingStyle> m_insertionStyle; |
| + RefPtrWillBeMember<EditingStyle> m_insertionStyle; |
| bool m_selectReplacement; |
| bool m_smartReplace; |
| bool m_matchStyle; |
| - RefPtrWillBePersistent<DocumentFragment> m_documentFragment; |
| + RefPtrWillBeMember<DocumentFragment> m_documentFragment; |
| bool m_preventNesting; |
| bool m_movingParagraph; |
| EditAction m_editAction; |