Index: Source/core/rendering/RenderObject.h |
diff --git a/Source/core/rendering/RenderObject.h b/Source/core/rendering/RenderObject.h |
index dc9a8a07484d64ee50213e2ca94cb30733f75813..7abce5d6c0a698e7259e374ee05f65ce5784835e 100644 |
--- a/Source/core/rendering/RenderObject.h |
+++ b/Source/core/rendering/RenderObject.h |
@@ -145,7 +145,7 @@ |
#endif |
// Base class for all rendering tree objects. |
-class RenderObject : public NoBaseWillBeGarbageCollectedFinalized<RenderObject>, public ImageResourceClient { |
+class RenderObject : public ImageResourceClient { |
friend class RenderBlock; |
friend class RenderBlockFlow; |
friend class RenderLayerReflectionInfo; // For setParent |
@@ -157,7 +157,6 @@ |
// marked as anonymous in the constructor. |
explicit RenderObject(Node*); |
virtual ~RenderObject(); |
- virtual void trace(Visitor*); |
virtual const char* renderName() const = 0; |
@@ -343,11 +342,9 @@ |
static RenderObject* createObject(Element*, RenderStyle*); |
-#if !ENABLE(OILPAN) |
// RenderObjects are allocated out of the rendering partition. |
void* operator new(size_t); |
void operator delete(void*); |
-#endif |
public: |
bool isPseudoElement() const { return node() && node()->isPseudoElement(); } |
@@ -618,7 +615,7 @@ |
Node* node() const |
{ |
- return isAnonymous() ? 0 : m_node.get(); |
+ return isAnonymous() ? 0 : m_node; |
} |
Node* nonPseudoNode() const |
@@ -627,7 +624,7 @@ |
} |
// FIXME: Why does RenderWidget need this? |
- void clearNode() { m_node = nullptr; } |
+ void clearNode() { m_node = 0; } |
// Returns the styled node that caused the generation of this renderer. |
// This is the same as node() except for renderers of :before and :after |
@@ -1166,11 +1163,11 @@ |
RefPtr<RenderStyle> m_style; |
- RawPtrWillBeMember<Node> m_node; |
- |
- RawPtrWillBeMember<RenderObject> m_parent; |
- RawPtrWillBeMember<RenderObject> m_previous; |
- RawPtrWillBeMember<RenderObject> m_next; |
+ Node* m_node; |
+ |
+ RenderObject* m_parent; |
+ RenderObject* m_previous; |
+ RenderObject* m_next; |
#if ENABLE(ASSERT) |
unsigned m_hasAXObject : 1; |