summaryrefslogtreecommitdiffstats
path: root/chromium/third_party/WebKit/Source/core/editing/MergeIdenticalElementsCommand.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/editing/MergeIdenticalElementsCommand.h')
-rw-r--r--chromium/third_party/WebKit/Source/core/editing/MergeIdenticalElementsCommand.h16
1 files changed, 9 insertions, 7 deletions
diff --git a/chromium/third_party/WebKit/Source/core/editing/MergeIdenticalElementsCommand.h b/chromium/third_party/WebKit/Source/core/editing/MergeIdenticalElementsCommand.h
index 42dd8a843ee..cdfa636be67 100644
--- a/chromium/third_party/WebKit/Source/core/editing/MergeIdenticalElementsCommand.h
+++ b/chromium/third_party/WebKit/Source/core/editing/MergeIdenticalElementsCommand.h
@@ -30,22 +30,24 @@
namespace WebCore {
-class MergeIdenticalElementsCommand : public SimpleEditCommand {
+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