| Index: Source/core/rendering/InlineBox.h
|
| diff --git a/Source/core/rendering/InlineBox.h b/Source/core/rendering/InlineBox.h
|
| index a7025cf58e2d5c446dc3660b8bd1ceb376d23057..5b05282f5996f8cbb1a1eef42e5d986b0b873b4f 100644
|
| --- a/Source/core/rendering/InlineBox.h
|
| +++ b/Source/core/rendering/InlineBox.h
|
| @@ -63,9 +63,12 @@ public:
|
|
|
| virtual ~InlineBox();
|
|
|
| - virtual void destroy(RenderArena*);
|
| + virtual void destroy();
|
| +#if ENABLE(PARTITION_ALLOC)
|
| + void* operator new(size_t);
|
| +#endif
|
|
|
| - virtual void deleteLine(RenderArena*);
|
| + virtual void deleteLine();
|
| virtual void extractLine();
|
| virtual void attachLine();
|
|
|
| @@ -97,17 +100,6 @@ public:
|
| virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom);
|
| virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom);
|
|
|
| - // Overloaded new operator.
|
| - void* operator new(size_t, RenderArena*);
|
| -
|
| - // Overridden to prevent the normal delete from being called.
|
| - void operator delete(void*, size_t);
|
| -
|
| -private:
|
| - // The normal operator new is disallowed.
|
| - void* operator new(size_t) throw();
|
| -
|
| -public:
|
| #ifndef NDEBUG
|
| void showTreeForThis() const;
|
| void showLineTreeForThis() const;
|
| @@ -397,6 +389,9 @@ private:
|
| InlineBoxBitfields m_bitfields;
|
|
|
| protected:
|
| +#if ENABLE(PARTITION_ALLOC)
|
| + void operator delete(void*);
|
| +#endif
|
| // For RootInlineBox
|
| bool endsWithBreak() const { return m_bitfields.endsWithBreak(); }
|
| void setEndsWithBreak(bool endsWithBreak) { m_bitfields.setEndsWithBreak(endsWithBreak); }
|
|
|