Replace RenderArena with PartitionAlloc.

Source/core/rendering/InlineBox.cpp

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
 #include "core/rendering/InlineBox.h"
 
 #include "core/dom/WebCoreMemoryInstrumentation.h"
+#include "core/platform/Partitions.h"
 #include "core/platform/graphics/FontMetrics.h"
 #include "core/rendering/InlineFlowBox.h"
 #include "core/rendering/PaintInfo.h"
-#include "core/rendering/RenderArena.h"
 #include "core/rendering/RenderBlock.h"
 #include "core/rendering/RootInlineBox.h"
 
 #ifndef NDEBUG
 #include <stdio.h>
 #endif
 
 using namespace std;
 
 namespace WebCore {
 
 struct SameSizeAsInlineBox {
     virtual ~SameSizeAsInlineBox() { }
     void* a[4];
     FloatPoint b;
     float c;
     uint32_t d : 32;
 #ifndef NDEBUG
     bool f;
 #endif
 };
 
 COMPILE_ASSERT(sizeof(InlineBox) == sizeof(SameSizeAsInlineBox), InlineBox_size_guard);
 
 #ifndef NDEBUG
-static bool inInlineBoxDetach;
-#endif
-
-#ifndef NDEBUG
 
 InlineBox::~InlineBox()
 {
     if (!m_hasBadParent && m_parent)
         m_parent->setHasBadChildList();
 }
 
 #endif
 
 void InlineBox::remove()
 { 
     if (parent())
         parent()->removeChild(this);
 }
 
-void InlineBox::destroy(RenderArena* renderArena)
+void InlineBox::destroy()
 {
-#ifndef NDEBUG
-    inInlineBoxDetach = true;
-#endif
     delete this;
-#ifndef NDEBUG
-    inInlineBoxDetach = false;
-#endif
-
-    // Recover the size left there for us by operator delete and free the memory.
-    renderArena->free(*(size_t *)this, this);
 }
 
-void* InlineBox::operator new(size_t sz, RenderArena* renderArena)
+#if ENABLE(PARTITION_ALLOC)
+void* InlineBox::operator new(size_t sz)
 {
-    return renderArena->allocate(sz);
+    return partitionAlloc(Partitions::getRenderingPartition(), sz);
 }
 
-void InlineBox::operator delete(void* ptr, size_t sz)
+void InlineBox::operator delete(void* ptr)
 {
-    ASSERT(inInlineBoxDetach);
-
-    // Stash size where destroy can find it.
-    *(size_t *)ptr = sz;
+    partitionFree(ptr);
 }
+#endif
 
 #ifndef NDEBUG
 const char* InlineBox::boxName() const
 {
     return "InlineBox";
 }
 
 void InlineBox::showTreeForThis() const
 {
     if (m_renderer)
@@ skipping 69 matching lines @@
     return m_renderer->caretMaxOffset(); 
 }
 
 void InlineBox::dirtyLineBoxes()
 {
     markDirty();
     for (InlineFlowBox* curr = parent(); curr && !curr->isDirty(); curr = curr->parent())
         curr->markDirty();
 }
 
-void InlineBox::deleteLine(RenderArena* arena)
+void InlineBox::deleteLine()
 {
     if (!m_bitfields.extracted() && m_renderer->isBox())
         toRenderBox(m_renderer)->setInlineBoxWrapper(0);
-    destroy(arena);
+    destroy();
 }
 
 void InlineBox::extractLine()
 {
     m_bitfields.setExtracted(true);
     if (m_renderer->isBox())
         toRenderBox(m_renderer)->setInlineBoxWrapper(0);
 }
 
 void InlineBox::attachLine()
@@ skipping 208 matching lines @@
         b->showTreeForThis();
 }
 
 void showLineTree(const WebCore::InlineBox* b)
 {
     if (b)
         b->showLineTreeForThis();
 }
 
 #endif