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

Unified Diff: Source/core/rendering/RenderObject.cpp

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.h ('k') | Source/core/rendering/RenderObjectChildList.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderObject.cpp
diff --git a/Source/core/rendering/RenderObject.cpp b/Source/core/rendering/RenderObject.cpp
index 3e66ef852ef54e20c49eb019e9eb0ca44b7d0956..4db5c5918070ac914af0f20b1068121555da0b79 100644
--- a/Source/core/rendering/RenderObject.cpp
+++ b/Source/core/rendering/RenderObject.cpp
@@ -132,7 +132,6 @@
bool RenderObject::s_affectsParentBlock = false;
-#if !ENABLE(OILPAN)
void* RenderObject::operator new(size_t sz)
{
ASSERT(isMainThread());
@@ -144,7 +143,6 @@
ASSERT(isMainThread());
partitionFree(ptr);
}
-#endif
RenderObject* RenderObject::createObject(Element* element, RenderStyle* style)
{
@@ -215,9 +213,9 @@
: ImageResourceClient()
, m_style(nullptr)
, m_node(node)
- , m_parent(nullptr)
- , m_previous(nullptr)
- , m_next(nullptr)
+ , m_parent(0)
+ , m_previous(0)
+ , m_next(0)
#if ENABLE(ASSERT)
, m_hasAXObject(false)
, m_setNeedsLayoutForbidden(false)
@@ -236,14 +234,6 @@
#ifndef NDEBUG
renderObjectCounter.decrement();
#endif
-}
-
-void RenderObject::trace(Visitor* visitor)
-{
- visitor->trace(m_node);
- visitor->trace(m_parent);
- visitor->trace(m_previous);
- visitor->trace(m_next);
}
String RenderObject::debugName() const
@@ -2850,9 +2840,8 @@
removeShapeImageClient(m_style->shapeOutside());
}
-#if !ENABLE(OILPAN)
+
delete this;
-#endif
}
PositionWithAffinity RenderObject::positionForPoint(const LayoutPoint&)
« no previous file with comments | « Source/core/rendering/RenderObject.h ('k') | Source/core/rendering/RenderObjectChildList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698