Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(664)

Unified Diff: Source/core/dom/ElementRareData.h

Issue 265793017: Oilpan: move node/element rare data objects to the heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased + have MutationObserver keep a weak ref to registrations Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/dom/ElementRareData.h
diff --git a/Source/core/dom/ElementRareData.h b/Source/core/dom/ElementRareData.h
index eaa50af15aa99fc1e4df794a9d5f498d29f6446b..7d1f487ebf0451d7f62ed51a73fdc7aafa68640a 100644
--- a/Source/core/dom/ElementRareData.h
+++ b/Source/core/dom/ElementRareData.h
@@ -32,6 +32,7 @@
#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 {
@@ -40,9 +41,9 @@ class HTMLElement;
class ElementRareData : public NodeRareData {
public:
- static PassOwnPtr<ElementRareData> create(RenderObject* renderer)
+ static RawPtr<ElementRareData> create(RenderObject* renderer)
haraken 2014/05/08 04:14:00 RawPtr => * ?
sof 2014/05/08 06:43:15 Done
{
- return adoptPtr(new ElementRareData(renderer));
+ return new ElementRareData(renderer);
}
~ElementRareData();
@@ -119,16 +120,7 @@ public:
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);
- visitor->trace(m_cssomWrapper);
- }
+ void traceAfterDispatch(Visitor*);
private:
short m_tabindex;
@@ -137,11 +129,10 @@ private:
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;
- GC_PLUGIN_IGNORE("http://crbug.com/370453")
+ OwnPtrWillBeMember<ActiveAnimations> m_activeAnimations;
OwnPtrWillBeMember<InlineCSSStyleDeclaration> m_cssomWrapper;
RefPtr<RenderStyle> m_computedStyle;
@@ -158,11 +149,14 @@ 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);

Powered by Google App Engine
This is Rietveld 408576698