| Index: Source/core/rendering/RenderLayer.h
|
| diff --git a/Source/core/rendering/RenderLayer.h b/Source/core/rendering/RenderLayer.h
|
| index c71c757aaa55f2bc31596cfee7a3a64bc18c5820..b88fca74e0475775ae26bbb4ae1f2a525979d9a3 100644
|
| --- a/Source/core/rendering/RenderLayer.h
|
| +++ b/Source/core/rendering/RenderLayer.h
|
| @@ -729,12 +729,9 @@ public:
|
|
|
| bool hasBlendMode() const;
|
|
|
| - // Overloaded new operator. Derived classes must override operator new
|
| - // in order to allocate out of the RenderArena.
|
| - void* operator new(size_t, RenderArena*);
|
| -
|
| - // Overridden to prevent the normal delete from being called.
|
| - void operator delete(void*, size_t);
|
| + void* operator new(size_t);
|
| + // Only safe to call from RenderLayerModelObject::destroyLayer()
|
| + void operator delete(void*);
|
|
|
| bool isComposited() const { return m_backing != 0; }
|
| bool hasCompositedMask() const;
|
| @@ -903,9 +900,6 @@ private:
|
|
|
| IntSize clampScrollOffset(const IntSize&) const;
|
|
|
| - // The normal operator new is disallowed on all render objects.
|
| - void* operator new(size_t) throw();
|
| -
|
| void setNextSibling(RenderLayer* next) { m_next = next; }
|
| void setPreviousSibling(RenderLayer* prev) { m_previous = prev; }
|
| void setParent(RenderLayer* parent);
|
| @@ -1100,9 +1094,6 @@ private:
|
| friend class RenderLayerCompositor;
|
| friend class RenderLayerModelObject;
|
|
|
| - // Only safe to call from RenderLayerModelObject::destroyLayer(RenderArena*)
|
| - void destroy(RenderArena*);
|
| -
|
| LayoutUnit overflowTop() const;
|
| LayoutUnit overflowBottom() const;
|
| LayoutUnit overflowLeft() const;
|
|
|