Oilpan: move node/element rare data objects to the heap.

Source/core/dom/ElementRareData.h

 /*
  * Copyright (C) 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 David Smith <catfish.man@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 14 matching lines @@
 #include "core/animation/ActiveAnimations.h"
 #include "core/dom/DatasetDOMStringMap.h"
 #include "core/dom/NamedNodeMap.h"
 #include "core/dom/NodeRareData.h"
 #include "core/dom/PseudoElement.h"
 #include "core/dom/custom/CustomElementDefinition.h"
 #include "core/dom/shadow/ElementShadow.h"
 #include "core/html/ClassList.h"
 #include "core/html/ime/InputMethodContext.h"
 #include "core/rendering/style/StyleInheritedData.h"
+#include "platform/heap/Handle.h"
 #include "wtf/OwnPtr.h"
 
 namespace WebCore {
 
 class HTMLElement;
 
 class ElementRareData : public NodeRareData {
 public:
-    static PassOwnPtr<ElementRareData> create(RenderObject* renderer)
+    static RawPtr<ElementRareData> create(RenderObject* renderer)

[haraken, 2014/05/07 02:10:26]

This could be ElementRareData*.

     {
-        return adoptPtr(new ElementRareData(renderer));
+        return new ElementRareData(renderer);
     }
 
     ~ElementRareData();
 
     void setPseudoElement(PseudoId, PassRefPtr<PseudoElement>);
     PseudoElement* pseudoElement(PseudoId) const;
 
     void resetStyleState();
 
     short tabIndex() const { return m_tabindex; }
@@ skipping 56 matching lines @@
             m_inputMethodContext = InputMethodContext::create(element);
         return *m_inputMethodContext;
     }
 
     bool hasPseudoElements() const;
     void clearPseudoElements();
 
     void setCustomElementDefinition(PassRefPtr<CustomElementDefinition> definition) { m_customElementDefinition = definition; }
     CustomElementDefinition* customElementDefinition() const { return m_customElementDefinition.get(); }
 
-    void trace(Visitor* visitor)
-    {
-        // FIXME: Oilpan: Implement real tracing of the
-        // ElementRareData when it has been moved to the
-        // oilpan heap and move the ElementShadow tracing
-        // to the ElementShadow when that has been moved
-        // to the oilpan heap.
-        visitor->trace(m_shadow);
-    }
+    void traceAfterDispatch(Visitor*);
 
 private:
     short m_tabindex;
 
     IntSize m_savedLayerScrollOffset;
 
     OwnPtr<DatasetDOMStringMap> m_dataset;
     OwnPtr<ClassList> m_classList;
-    OwnPtr<ElementShadow> m_shadow;
+    OwnPtrWillBeMember<ElementShadow> m_shadow;
     OwnPtr<NamedNodeMap> m_attributeMap;
     OwnPtr<InputMethodContext> m_inputMethodContext;
-    OwnPtrWillBePersistent<ActiveAnimations> m_activeAnimations;
+    OwnPtrWillBeMember<ActiveAnimations> m_activeAnimations;
     OwnPtr<InlineCSSStyleDeclaration> m_cssomWrapper;
 
     RefPtr<RenderStyle> m_computedStyle;
     RefPtr<CustomElementDefinition> m_customElementDefinition;
 
     RefPtr<PseudoElement> m_generatedBefore;
     RefPtr<PseudoElement> m_generatedAfter;
     RefPtr<PseudoElement> m_backdrop;
 
     explicit ElementRareData(RenderObject*);
 };
 
 inline ElementRareData::ElementRareData(RenderObject* renderer)
     : NodeRareData(renderer)
     , m_tabindex(0)
 {
+    m_isElementRareData = true;
 }
 
 inline ElementRareData::~ElementRareData()
 {
+#if !ENABLE(OILPAN)
     ASSERT(!m_shadow);
+#endif
     ASSERT(!m_generatedBefore);
     ASSERT(!m_generatedAfter);
     ASSERT(!m_backdrop);
 }
 
 inline bool ElementRareData::hasPseudoElements() const
 {
     return m_generatedBefore || m_generatedAfter || m_backdrop;
 }
 
@@ skipping 42 matching lines @@
 }
 
 inline void ElementRareData::resetStyleState()
 {
     clearElementFlag(StyleAffectedByEmpty);
 }
 
 } // namespace
 
 #endif // ElementRareData_h