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

Unified Diff: Source/core/rendering/RenderObjectChildList.h

Issue 425203002: Revert of Oilpan: Prepare to move RenderObject and RenderObjectChildList to Oilpan heap. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 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
« no previous file with comments | « Source/core/rendering/RenderObject.cpp ('k') | Source/core/rendering/RenderObjectChildList.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderObjectChildList.h
diff --git a/Source/core/rendering/RenderObjectChildList.h b/Source/core/rendering/RenderObjectChildList.h
index da4575b13a60db8f4c5dcdbf18f02074a9d59752..7b5c57a06c63b5b8e4e84f1eab8257fa1cf848f5 100644
--- a/Source/core/rendering/RenderObjectChildList.h
+++ b/Source/core/rendering/RenderObjectChildList.h
@@ -26,7 +26,6 @@
#ifndef RenderObjectChildList_h
#define RenderObjectChildList_h
-#include "platform/heap/Handle.h"
#include "wtf/Forward.h"
namespace blink {
@@ -34,17 +33,15 @@
class RenderObject;
class RenderObjectChildList {
- DISALLOW_ALLOCATION();
public:
RenderObjectChildList()
- : m_firstChild(nullptr)
- , m_lastChild(nullptr)
+ : m_firstChild(0)
+ , m_lastChild(0)
{
}
- void trace(Visitor*);
- RenderObject* firstChild() const { return m_firstChild.get(); }
- RenderObject* lastChild() const { return m_lastChild.get(); }
+ RenderObject* firstChild() const { return m_firstChild; }
+ RenderObject* lastChild() const { return m_lastChild; }
// FIXME: Temporary while RenderBox still exists. Eventually this will just happen during insert/append/remove methods on the child list, and nobody
// will need to manipulate firstChild or lastChild directly.
@@ -61,8 +58,8 @@
}
private:
- RawPtrWillBeMember<RenderObject> m_firstChild;
- RawPtrWillBeMember<RenderObject> m_lastChild;
+ RenderObject* m_firstChild;
+ RenderObject* m_lastChild;
};
} // namespace blink
« no previous file with comments | « Source/core/rendering/RenderObject.cpp ('k') | Source/core/rendering/RenderObjectChildList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698