| Index: third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.h
|
| diff --git a/third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.h b/third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.h
|
| index 29981911446ee72429700d62b1f94261a13af0da..d998ccabdd856e598ada90102d43499e0b92c687 100644
|
| --- a/third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.h
|
| +++ b/third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.h
|
| @@ -47,9 +47,9 @@ public:
|
|
|
| typedef unsigned CommandOptions;
|
|
|
| - static PassRefPtrWillBeRawPtr<ReplaceSelectionCommand> create(Document& document, PassRefPtrWillBeRawPtr<DocumentFragment> fragment, CommandOptions options, EditAction action = EditActionPaste)
|
| + static RawPtr<ReplaceSelectionCommand> create(Document& document, RawPtr<DocumentFragment> fragment, CommandOptions options, EditAction action = EditActionPaste)
|
| {
|
| - return adoptRefWillBeNoop(new ReplaceSelectionCommand(document, fragment, options, action));
|
| + return new ReplaceSelectionCommand(document, fragment, options, action);
|
| }
|
|
|
| EphemeralRange insertedRange() const;
|
| @@ -57,7 +57,7 @@ public:
|
| DECLARE_VIRTUAL_TRACE();
|
|
|
| private:
|
| - ReplaceSelectionCommand(Document&, PassRefPtrWillBeRawPtr<DocumentFragment>, CommandOptions, EditAction);
|
| + ReplaceSelectionCommand(Document&, RawPtr<DocumentFragment>, CommandOptions, EditAction);
|
|
|
| void doApply(EditingState*) override;
|
| EditAction editingAction() const override;
|
| @@ -76,11 +76,11 @@ private:
|
| Node* pastLastLeaf() const { return m_lastNodeInserted ? NodeTraversal::next(NodeTraversal::lastWithinOrSelf(*m_lastNodeInserted)) : 0; }
|
|
|
| private:
|
| - RefPtrWillBeMember<Node> m_firstNodeInserted;
|
| - RefPtrWillBeMember<Node> m_lastNodeInserted;
|
| + Member<Node> m_firstNodeInserted;
|
| + Member<Node> m_lastNodeInserted;
|
| };
|
|
|
| - Node* insertAsListItems(PassRefPtrWillBeRawPtr<HTMLElement> listElement, Element* insertionBlock, const Position&, InsertedNodes&, EditingState*);
|
| + Node* insertAsListItems(RawPtr<HTMLElement> listElement, Element* insertionBlock, const Position&, InsertedNodes&, EditingState*);
|
|
|
| void updateNodesInserted(Node*);
|
| bool shouldRemoveEndBR(HTMLBRElement*, const VisiblePosition&);
|
| @@ -95,7 +95,7 @@ private:
|
|
|
| void removeRedundantStylesAndKeepStyleSpanInline(InsertedNodes&, EditingState*);
|
| void makeInsertedContentRoundTrippableWithHTMLTreeBuilder(const InsertedNodes&, EditingState*);
|
| - void moveElementOutOfAncestor(PassRefPtrWillBeRawPtr<Element>, PassRefPtrWillBeRawPtr<Element> ancestor, EditingState*);
|
| + void moveElementOutOfAncestor(RawPtr<Element>, RawPtr<Element> ancestor, EditingState*);
|
| void handleStyleSpans(InsertedNodes&, EditingState*);
|
|
|
| VisiblePosition positionAtStartOfInsertedContent() const;
|
| @@ -110,11 +110,11 @@ private:
|
|
|
| Position m_startOfInsertedContent;
|
| Position m_endOfInsertedContent;
|
| - RefPtrWillBeMember<EditingStyle> m_insertionStyle;
|
| + Member<EditingStyle> m_insertionStyle;
|
| bool m_selectReplacement;
|
| bool m_smartReplace;
|
| bool m_matchStyle;
|
| - RefPtrWillBeMember<DocumentFragment> m_documentFragment;
|
| + Member<DocumentFragment> m_documentFragment;
|
| bool m_preventNesting;
|
| bool m_movingParagraph;
|
| EditAction m_editAction;
|
|
|