| Index: Source/core/editing/MergeIdenticalElementsCommand.h
|
| diff --git a/Source/core/editing/MergeIdenticalElementsCommand.h b/Source/core/editing/MergeIdenticalElementsCommand.h
|
| index 7f82f7ceb2f90097a16f2643224bc21ccfceb804..cdfa636be6717848519e8549d4074e6cf2c51e7f 100644
|
| --- a/Source/core/editing/MergeIdenticalElementsCommand.h
|
| +++ b/Source/core/editing/MergeIdenticalElementsCommand.h
|
| @@ -32,20 +32,22 @@ namespace WebCore {
|
|
|
| class MergeIdenticalElementsCommand FINAL : public SimpleEditCommand {
|
| public:
|
| - static PassRefPtr<MergeIdenticalElementsCommand> create(PassRefPtr<Element> element1, PassRefPtr<Element> element2)
|
| + static PassRefPtrWillBeRawPtr<MergeIdenticalElementsCommand> create(PassRefPtrWillBeRawPtr<Element> element1, PassRefPtrWillBeRawPtr<Element> element2)
|
| {
|
| - return adoptRef(new MergeIdenticalElementsCommand(element1, element2));
|
| + return adoptRefWillBeNoop(new MergeIdenticalElementsCommand(element1, element2));
|
| }
|
|
|
| + virtual void trace(Visitor*) OVERRIDE;
|
| +
|
| private:
|
| - MergeIdenticalElementsCommand(PassRefPtr<Element>, PassRefPtr<Element>);
|
| + MergeIdenticalElementsCommand(PassRefPtrWillBeRawPtr<Element>, PassRefPtrWillBeRawPtr<Element>);
|
|
|
| virtual void doApply() OVERRIDE;
|
| virtual void doUnapply() OVERRIDE;
|
|
|
| - RefPtr<Element> m_element1;
|
| - RefPtr<Element> m_element2;
|
| - RefPtr<Node> m_atChild;
|
| + RefPtrWillBeMember<Element> m_element1;
|
| + RefPtrWillBeMember<Element> m_element2;
|
| + RefPtrWillBeMember<Node> m_atChild;
|
| };
|
|
|
| } // namespace WebCore
|
|
|