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

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

Issue 16896019: Replace RenderArena with PartitionAlloc. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 6 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
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); }

Powered by Google App Engine
This is Rietveld 408576698