| Index: Source/core/rendering/RenderObject.cpp
|
| diff --git a/Source/core/rendering/RenderObject.cpp b/Source/core/rendering/RenderObject.cpp
|
| index f778c9dbad2751173dd1c4f2e2d5ee02f43e2639..90d7959314e4d50ddfd18734b7a755eadfcfd037 100644
|
| --- a/Source/core/rendering/RenderObject.cpp
|
| +++ b/Source/core/rendering/RenderObject.cpp
|
| @@ -124,9 +124,6 @@ struct SameSizeAsRenderObject {
|
| void* pointers[5];
|
| #if ENABLE(ASSERT)
|
| unsigned m_debugBitfields : 2;
|
| -#if ENABLE(OILPAN)
|
| - unsigned m_oilpanBitfields : 1;
|
| -#endif
|
| #endif
|
| unsigned m_bitfields;
|
| unsigned m_bitfields2;
|
| @@ -141,7 +138,6 @@ bool RenderObject::s_affectsParentBlock = false;
|
| typedef HashMap<const RenderObject*, LayoutRect> SelectionPaintInvalidationMap;
|
| static SelectionPaintInvalidationMap* selectionPaintInvalidationMap = 0;
|
|
|
| -#if !ENABLE(OILPAN)
|
| void* RenderObject::operator new(size_t sz)
|
| {
|
| ASSERT(isMainThread());
|
| @@ -153,7 +149,6 @@ void RenderObject::operator delete(void* ptr)
|
| ASSERT(isMainThread());
|
| partitionFree(ptr);
|
| }
|
| -#endif
|
|
|
| RenderObject* RenderObject::createObject(Element* element, RenderStyle* style)
|
| {
|
| @@ -231,9 +226,6 @@ RenderObject::RenderObject(Node* node)
|
| #if ENABLE(ASSERT)
|
| , m_hasAXObject(false)
|
| , m_setNeedsLayoutForbidden(false)
|
| -#if ENABLE(OILPAN)
|
| - , m_didCallDestroy(false)
|
| -#endif
|
| #endif
|
| , m_bitfields(node)
|
| {
|
| @@ -246,23 +238,12 @@ RenderObject::RenderObject(Node* node)
|
| RenderObject::~RenderObject()
|
| {
|
| ASSERT(!m_hasAXObject);
|
| -#if ENABLE(OILPAN)
|
| - ASSERT(m_didCallDestroy);
|
| -#endif
|
| #ifndef NDEBUG
|
| renderObjectCounter.decrement();
|
| #endif
|
| --s_instanceCount;
|
| }
|
|
|
| -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
|
| {
|
| StringBuilder name;
|
| @@ -2466,10 +2447,6 @@ void RenderObject::destroyAndCleanupAnonymousWrappers()
|
|
|
| void RenderObject::destroy()
|
| {
|
| -#if ENABLE(ASSERT) && ENABLE(OILPAN)
|
| - ASSERT(!m_didCallDestroy);
|
| - m_didCallDestroy = true;
|
| -#endif
|
| willBeDestroyed();
|
| postDestroy();
|
| }
|
| @@ -2505,9 +2482,7 @@ void RenderObject::postDestroy()
|
| removeShapeImageClient(m_style->shapeOutside());
|
| }
|
| ResourceLoadPriorityOptimizer::resourceLoadPriorityOptimizer()->removeRenderObject(this);
|
| -#if !ENABLE(OILPAN)
|
| delete this;
|
| -#endif
|
| }
|
|
|
| PositionWithAffinity RenderObject::positionForPoint(const LayoutPoint&)
|
|
|