Oilpan: Move DOMEditor to the heap

Source/core/inspector/DOMEditor.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 56 matching lines @@
         m_parentNode->insertBefore(m_node.get(), m_anchorNode.get(), exceptionState);
         return !exceptionState.hadException();
     }
 
     virtual bool redo(ExceptionState& exceptionState) OVERRIDE
     {
         m_parentNode->removeChild(m_node.get(), exceptionState);
         return !exceptionState.hadException();
     }
 
+    virtual void trace(Visitor* visitor) OVERRIDE
+    {
+        visitor->trace(m_parentNode);
+        visitor->trace(m_node);
+        visitor->trace(m_anchorNode);
+        InspectorHistory::Action::trace(visitor);
+    }
+
 private:
-    RefPtr<Node> m_parentNode;
-    RefPtr<Node> m_node;
-    RefPtr<Node> m_anchorNode;
+    RefPtrWillBeMember<Node> m_parentNode;
+    RefPtrWillBeMember<Node> m_node;
+    RefPtrWillBeMember<Node> m_anchorNode;
 };
 
 class DOMEditor::InsertBeforeAction FINAL : public InspectorHistory::Action {
     WTF_MAKE_NONCOPYABLE(InsertBeforeAction);
 public:
     InsertBeforeAction(Node* parentNode, PassRefPtr<Node> node, Node* anchorNode)
         : InspectorHistory::Action("InsertBefore")
         , m_parentNode(parentNode)
         , m_node(node)
         , m_anchorNode(anchorNode)
     {
     }
 
     virtual bool perform(ExceptionState& exceptionState) OVERRIDE
     {
         if (m_node->parentNode()) {
-            m_removeChildAction = adoptRef(new RemoveChildAction(m_node->parentNode(), m_node.get()));
+            m_removeChildAction = adoptRefWillBeNoop(new RemoveChildAction(m_node->parentNode(), m_node.get()));
             if (!m_removeChildAction->perform(exceptionState))
                 return false;
         }
         m_parentNode->insertBefore(m_node.get(), m_anchorNode.get(), exceptionState);
         return !exceptionState.hadException();
     }
 
     virtual bool undo(ExceptionState& exceptionState) OVERRIDE
     {
         m_parentNode->removeChild(m_node.get(), exceptionState);
         if (exceptionState.hadException())
             return false;
         if (m_removeChildAction)
             return m_removeChildAction->undo(exceptionState);
         return true;
     }
 
     virtual bool redo(ExceptionState& exceptionState) OVERRIDE
     {
         if (m_removeChildAction && !m_removeChildAction->redo(exceptionState))
             return false;
         m_parentNode->insertBefore(m_node.get(), m_anchorNode.get(), exceptionState);
         return !exceptionState.hadException();
     }
 
+    virtual void trace(Visitor* visitor) OVERRIDE
+    {
+        visitor->trace(m_parentNode);
+        visitor->trace(m_node);
+        visitor->trace(m_anchorNode);
+        visitor->trace(m_removeChildAction);
+        InspectorHistory::Action::trace(visitor);
+    }
+
 private:
-    RefPtr<Node> m_parentNode;
-    RefPtr<Node> m_node;
-    RefPtr<Node> m_anchorNode;
-    RefPtr<RemoveChildAction> m_removeChildAction;
+    RefPtrWillBeMember<Node> m_parentNode;
+    RefPtrWillBeMember<Node> m_node;
+    RefPtrWillBeMember<Node> m_anchorNode;
+    RefPtrWillBeMember<RemoveChildAction> m_removeChildAction;
 };
 
 class DOMEditor::RemoveAttributeAction FINAL : public InspectorHistory::Action {
     WTF_MAKE_NONCOPYABLE(RemoveAttributeAction);
 public:
     RemoveAttributeAction(Element* element, const AtomicString& name)
         : InspectorHistory::Action("RemoveAttribute")
         , m_element(element)
         , m_name(name)
     {
@@ skipping 10 matching lines @@
         m_element->setAttribute(m_name, m_value, exceptionState);
         return true;
     }
 
     virtual bool redo(ExceptionState&) OVERRIDE
     {
         m_element->removeAttribute(m_name);
         return true;
     }
 
+    virtual void trace(Visitor* visitor) OVERRIDE
+    {
+        visitor->trace(m_element);
+        InspectorHistory::Action::trace(visitor);
+    }
+
 private:
-    RefPtr<Element> m_element;
+    RefPtrWillBeMember<Element> m_element;
     AtomicString m_name;
     AtomicString m_value;
 };
 
 class DOMEditor::SetAttributeAction FINAL : public InspectorHistory::Action {
     WTF_MAKE_NONCOPYABLE(SetAttributeAction);
 public:
     SetAttributeAction(Element* element, const AtomicString& name, const AtomicString& value)
         : InspectorHistory::Action("SetAttribute")
         , m_element(element)
@@ skipping 20 matching lines @@
             m_element->removeAttribute(m_name);
         return true;
     }
 
     virtual bool redo(ExceptionState& exceptionState) OVERRIDE
     {
         m_element->setAttribute(m_name, m_value, exceptionState);
         return true;
     }
 
+    virtual void trace(Visitor* visitor) OVERRIDE
+    {
+        visitor->trace(m_element);
+        InspectorHistory::Action::trace(visitor);
+    }
+
 private:
-    RefPtr<Element> m_element;
+    RefPtrWillBeMember<Element> m_element;
     AtomicString m_name;
     AtomicString m_value;
     bool m_hadAttribute;
     AtomicString m_oldValue;
 };
 
 class DOMEditor::SetOuterHTMLAction FINAL : public InspectorHistory::Action {
     WTF_MAKE_NONCOPYABLE(SetOuterHTMLAction);
 public:
     SetOuterHTMLAction(Node* node, const String& html)
         : InspectorHistory::Action("SetOuterHTML")
         , m_node(node)
         , m_nextSibling(node->nextSibling())
         , m_html(html)
         , m_newNode(0)
-        , m_history(adoptPtr(new InspectorHistory()))
-        , m_domEditor(adoptPtr(new DOMEditor(m_history.get())))
+        , m_history(adoptPtrWillBeNoop(new InspectorHistory()))
+        , m_domEditor(adoptPtrWillBeNoop(new DOMEditor(m_history.get())))
     {
     }
 
     virtual bool perform(ExceptionState& exceptionState) OVERRIDE
     {
         m_oldHTML = createMarkup(m_node.get());
         ASSERT(m_node->ownerDocument());
         DOMPatchSupport domPatchSupport(m_domEditor.get(), *m_node->ownerDocument());
         m_newNode = domPatchSupport.patchNode(m_node.get(), m_html, exceptionState);
         return !exceptionState.hadException();
     }
 
     virtual bool undo(ExceptionState& exceptionState) OVERRIDE
     {
         return m_history->undo(exceptionState);
     }
 
     virtual bool redo(ExceptionState& exceptionState) OVERRIDE
     {
         return m_history->redo(exceptionState);
     }
 
     Node* newNode()
     {
         return m_newNode;
     }
 
+    virtual void trace(Visitor* visitor) OVERRIDE
+    {
+        visitor->trace(m_node);
+        visitor->trace(m_nextSibling);
+        visitor->trace(m_history);
+        visitor->trace(m_domEditor);
+        InspectorHistory::Action::trace(visitor);
+    }
+
 private:
-    RefPtr<Node> m_node;
-    RefPtr<Node> m_nextSibling;
+    RefPtrWillBeMember<Node> m_node;
+    RefPtrWillBeMember<Node> m_nextSibling;
     String m_html;
     String m_oldHTML;
     Node* m_newNode;

[haraken, 2014/05/22 20:19:31]

I think this should be RawPtrWillBeMember. (I wonder why this pointer was not a
RefPtr before.)

[keishi, 2014/05/23 02:22:20]

Done.

-    OwnPtr<InspectorHistory> m_history;
-    OwnPtr<DOMEditor> m_domEditor;
+    OwnPtrWillBeMember<InspectorHistory> m_history;
+    OwnPtrWillBeMember<DOMEditor> m_domEditor;
 };
 
 class DOMEditor::ReplaceWholeTextAction FINAL : public InspectorHistory::Action {
     WTF_MAKE_NONCOPYABLE(ReplaceWholeTextAction);
 public:
     ReplaceWholeTextAction(Text* textNode, const String& text)
         : InspectorHistory::Action("ReplaceWholeText")
         , m_textNode(textNode)
         , m_text(text)
     {
@@ skipping 10 matching lines @@
         m_textNode->replaceWholeText(m_oldText);
         return true;
     }
 
     virtual bool redo(ExceptionState&) OVERRIDE
     {
         m_textNode->replaceWholeText(m_text);
         return true;
     }
 
+    virtual void trace(Visitor* visitor) OVERRIDE
+    {
+        visitor->trace(m_textNode);
+        InspectorHistory::Action::trace(visitor);
+    }
+
 private:
-    RefPtrWillBePersistent<Text> m_textNode;
+    RefPtrWillBeMember<Text> m_textNode;
     String m_text;
     String m_oldText;
 };
 
 class DOMEditor::ReplaceChildNodeAction FINAL : public InspectorHistory::Action {
     WTF_MAKE_NONCOPYABLE(ReplaceChildNodeAction);
 public:
     ReplaceChildNodeAction(Node* parentNode, PassRefPtr<Node> newNode, Node* oldNode)
         : InspectorHistory::Action("ReplaceChildNode")
         , m_parentNode(parentNode)
@@ skipping 12 matching lines @@
         m_parentNode->replaceChild(m_oldNode, m_newNode.get(), exceptionState);
         return !exceptionState.hadException();
     }
 
     virtual bool redo(ExceptionState& exceptionState) OVERRIDE
     {
         m_parentNode->replaceChild(m_newNode, m_oldNode.get(), exceptionState);
         return !exceptionState.hadException();
     }
 
+    virtual void trace(Visitor* visitor) OVERRIDE
+    {
+        visitor->trace(m_parentNode);
+        visitor->trace(m_newNode);
+        visitor->trace(m_oldNode);
+        InspectorHistory::Action::trace(visitor);
+    }
+
 private:
-    RefPtr<Node> m_parentNode;
-    RefPtr<Node> m_newNode;
-    RefPtr<Node> m_oldNode;
+    RefPtrWillBeMember<Node> m_parentNode;
+    RefPtrWillBeMember<Node> m_newNode;
+    RefPtrWillBeMember<Node> m_oldNode;
 };
 
 class DOMEditor::SetNodeValueAction FINAL : public InspectorHistory::Action {
     WTF_MAKE_NONCOPYABLE(SetNodeValueAction);
 public:
     SetNodeValueAction(Node* node, const String& value)
         : InspectorHistory::Action("SetNodeValue")
         , m_node(node)
         , m_value(value)
     {
@@ skipping 10 matching lines @@
         m_node->setNodeValue(m_oldValue);
         return true;
     }
 
     virtual bool redo(ExceptionState&) OVERRIDE
     {
         m_node->setNodeValue(m_value);
         return true;
     }
 
+    virtual void trace(Visitor* visitor) OVERRIDE
+    {
+        visitor->trace(m_node);
+        InspectorHistory::Action::trace(visitor);
+    }
+
 private:
-    RefPtr<Node> m_node;
+    RefPtrWillBeMember<Node> m_node;
     String m_value;
     String m_oldValue;
 };
 
 DOMEditor::DOMEditor(InspectorHistory* history) : m_history(history) { }
 
-DOMEditor::~DOMEditor() { }
-
 bool DOMEditor::insertBefore(Node* parentNode, PassRefPtr<Node> node, Node* anchorNode, ExceptionState& exceptionState)
 {
-    return m_history->perform(adoptRef(new InsertBeforeAction(parentNode, node, anchorNode)), exceptionState);
+    return m_history->perform(adoptRefWillBeNoop(new InsertBeforeAction(parentNode, node, anchorNode)), exceptionState);
 }
 
 bool DOMEditor::removeChild(Node* parentNode, Node* node, ExceptionState& exceptionState)
 {
-    return m_history->perform(adoptRef(new RemoveChildAction(parentNode, node)), exceptionState);
+    return m_history->perform(adoptRefWillBeNoop(new RemoveChildAction(parentNode, node)), exceptionState);
 }
 
 bool DOMEditor::setAttribute(Element* element, const String& name, const String& value, ExceptionState& exceptionState)
 {
-    return m_history->perform(adoptRef(new SetAttributeAction(element, AtomicString(name), AtomicString(value))), exceptionState);
+    return m_history->perform(adoptRefWillBeNoop(new SetAttributeAction(element, AtomicString(name), AtomicString(value))), exceptionState);
 }
 
 bool DOMEditor::removeAttribute(Element* element, const String& name, ExceptionState& exceptionState)
 {
-    return m_history->perform(adoptRef(new RemoveAttributeAction(element, AtomicString(name))), exceptionState);
+    return m_history->perform(adoptRefWillBeNoop(new RemoveAttributeAction(element, AtomicString(name))), exceptionState);
 }
 
 bool DOMEditor::setOuterHTML(Node* node, const String& html, Node** newNode, ExceptionState& exceptionState)
 {
-    RefPtr<SetOuterHTMLAction> action = adoptRef(new SetOuterHTMLAction(node, html));
+    RefPtrWillBeRawPtr<SetOuterHTMLAction> action = adoptRefWillBeNoop(new SetOuterHTMLAction(node, html));
     bool result = m_history->perform(action, exceptionState);
     if (result)
         *newNode = action->newNode();
     return result;
 }
 
 bool DOMEditor::replaceWholeText(Text* textNode, const String& text, ExceptionState& exceptionState)
 {
-    return m_history->perform(adoptRef(new ReplaceWholeTextAction(textNode, text)), exceptionState);
+    return m_history->perform(adoptRefWillBeNoop(new ReplaceWholeTextAction(textNode, text)), exceptionState);
 }
 
 bool DOMEditor::replaceChild(Node* parentNode, PassRefPtr<Node> newNode, Node* oldNode, ExceptionState& exceptionState)
 {
-    return m_history->perform(adoptRef(new ReplaceChildNodeAction(parentNode, newNode, oldNode)), exceptionState);
+    return m_history->perform(adoptRefWillBeNoop(new ReplaceChildNodeAction(parentNode, newNode, oldNode)), exceptionState);
 }
 
 bool DOMEditor::setNodeValue(Node* node, const String& value, ExceptionState& exceptionState)
 {
-    return m_history->perform(adoptRef(new SetNodeValueAction(node, value)), exceptionState);
+    return m_history->perform(adoptRefWillBeNoop(new SetNodeValueAction(node, value)), exceptionState);
 }
 
 static void populateErrorString(ExceptionState& exceptionState, ErrorString* errorString)
 {
     if (exceptionState.hadException())
         *errorString = DOMException::getErrorName(exceptionState.code());
 }
 
 bool DOMEditor::insertBefore(Node* parentNode, PassRefPtr<Node> node, Node* anchorNode, ErrorString* errorString)
 {
@@ skipping 36 matching lines @@
 }
 
 bool DOMEditor::replaceWholeText(Text* textNode, const String& text, ErrorString* errorString)
 {
     TrackExceptionState exceptionState;
     bool result = replaceWholeText(textNode, text, exceptionState);
     populateErrorString(exceptionState, errorString);
     return result;
 }
 
+void DOMEditor::trace(Visitor* visitor)
+{
+    visitor->trace(m_history);
+}
+
 } // namespace WebCore