Revert of Oilpan: Prepare to move RenderObject and RenderObjectChildList to Oilpan heap.

Source/core/rendering/RenderObject.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 127 matching lines @@
     bool draggable;
 };
 
 typedef WTF::HashMap<const RenderLayer*, Vector<LayoutRect> > LayerHitTestRects;
 
 #ifndef NDEBUG
 const int showTreeCharacterOffset = 39;
 #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
     friend class RenderLayerScrollableArea; // For setParent.
     friend class RenderObjectChildList;
     WTF_MAKE_NONCOPYABLE(RenderObject);
 public:
     // Anonymous objects should pass the document as their node, and they will then automatically be
     // marked as anonymous in the constructor.
     explicit RenderObject(Node*);
     virtual ~RenderObject();
-    virtual void trace(Visitor*);
 
     virtual const char* renderName() const = 0;
 
     String debugName() const;
 
     RenderObject* parent() const { return m_parent; }
     bool isDescendantOf(const RenderObject*) const;
 
     RenderObject* previousSibling() const { return m_previous; }
     RenderObject* nextSibling() const { return m_next; }
@@ skipping 165 matching lines @@
 
     void showRenderObject() const;
     // We don't make printedCharacters an optional parameter so that
     // showRenderObject can be called from gdb easily.
     void showRenderObject(int printedCharacters) const;
     void showRenderTreeAndMark(const RenderObject* markedObject1 = 0, const char* markedLabel1 = 0, const RenderObject* markedObject2 = 0, const char* markedLabel2 = 0, int depth = 0) const;
 #endif
 
     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(); }
 
     virtual bool isBoxModelObject() const { return false; }
     virtual bool isBR() const { return false; }
     virtual bool isCanvas() const { return false; }
     virtual bool isCounter() const { return false; }
     virtual bool isDetailsMarker() const { return false; }
     virtual bool isEmbeddedObject() const { return false; }
@@ skipping 250 matching lines @@
 
     virtual void updateDragState(bool dragOn);
 
     RenderView* view() const { return document().renderView(); };
     FrameView* frameView() const { return document().view(); };
 
     bool isRooted() const;
 
     Node* node() const
     {
-        return isAnonymous() ? 0 : m_node.get();
+        return isAnonymous() ? 0 : m_node;
     }
 
     Node* nonPseudoNode() const
     {
         return isPseudoElement() ? 0 : node();
     }
 
     // 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
     // pseudo elements for which their parent node is returned.
     Node* generatingNode() const { return isPseudoElement() ? node()->parentOrShadowHostNode() : node(); }
 
     Document& document() const { return m_node->document(); }
     LocalFrame* frame() const { return document().frame(); }
 
     bool hasOutlineAnnotation() const;
@@ skipping 518 matching lines @@
     void markContainingBlockChainForPaintInvalidation()
     {
         for (RenderObject* container = this->container(); container && !container->shouldCheckForPaintInvalidation(); container = container->container())
             container->setMayNeedPaintInvalidation(true);
     }
 
     static bool isAllowedToModifyRenderTreeStructure(Document&);
 
     RefPtr<RenderStyle> m_style;
 
-    RawPtrWillBeMember<Node> m_node;
+    Node* m_node;
 
-    RawPtrWillBeMember<RenderObject> m_parent;
-    RawPtrWillBeMember<RenderObject> m_previous;
-    RawPtrWillBeMember<RenderObject> m_next;
+    RenderObject* m_parent;
+    RenderObject* m_previous;
+    RenderObject* m_next;
 
 #if ENABLE(ASSERT)
     unsigned m_hasAXObject             : 1;
     unsigned m_setNeedsLayoutForbidden : 1;
 #endif
 
 #define ADD_BOOLEAN_BITFIELD(name, Name) \
     private:\
         unsigned m_##name : 1;\
     public:\
@@ skipping 351 matching lines @@
 void showTree(const blink::RenderObject*);
 void showLineTree(const blink::RenderObject*);
 void showRenderTree(const blink::RenderObject* object1);
 // We don't make object2 an optional parameter so that showRenderTree
 // can be called from gdb easily.
 void showRenderTree(const blink::RenderObject* object1, const blink::RenderObject* object2);
 
 #endif
 
 #endif // RenderObject_h