<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[149695] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/149695">149695</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-05-07 15:06:15 -0700 (Tue, 07 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove custom allocator support from PODArena
https://bugs.webkit.org/show_bug.cgi?id=115762

Reviewed by Andreas Kling.

Nobody uses PODArena with a custom allocator, so just get rid of it and always use fastMalloc/fastFree.

* platform/PODArena.h:
(WebCore::PODArena::PODArena):
(WebCore::PODArena::allocateBase):
(WebCore::PODArena::Chunk::Chunk):
(WebCore::PODArena::Chunk::~Chunk):
(Chunk):
* platform/PODFreeListArena.h:
(WebCore::PODFreeListArena::allocate):
(WebCore::PODFreeListArena::FreeListChunk::FreeListChunk):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformPODArenah">trunk/Source/WebCore/platform/PODArena.h</a></li>
<li><a href="#trunkSourceWebCoreplatformPODFreeListArenah">trunk/Source/WebCore/platform/PODFreeListArena.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (149694 => 149695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-05-07 22:04:01 UTC (rev 149694)
+++ trunk/Source/WebCore/ChangeLog        2013-05-07 22:06:15 UTC (rev 149695)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2013-05-07  Anders Carlsson  &lt;andersca@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Remove custom allocator support from PODArena
+        https://bugs.webkit.org/show_bug.cgi?id=115762
+
+        Reviewed by Andreas Kling.
+
+        Nobody uses PODArena with a custom allocator, so just get rid of it and always use fastMalloc/fastFree.
+
+        * platform/PODArena.h:
+        (WebCore::PODArena::PODArena):
+        (WebCore::PODArena::allocateBase):
+        (WebCore::PODArena::Chunk::Chunk):
+        (WebCore::PODArena::Chunk::~Chunk):
+        (Chunk):
+        * platform/PODFreeListArena.h:
+        (WebCore::PODFreeListArena::allocate):
+        (WebCore::PODFreeListArena::FreeListChunk::FreeListChunk):
+
+2013-05-07  Anders Carlsson  &lt;andersca@apple.com&gt;
+
</ins><span class="cx">         Clean up KeyframeValueList and related classes
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=115738
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPODArenah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PODArena.h (149694 => 149695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PODArena.h        2013-05-07 22:04:01 UTC (rev 149694)
+++ trunk/Source/WebCore/platform/PODArena.h        2013-05-07 22:06:15 UTC (rev 149695)
</span><span class="lines">@@ -44,45 +44,12 @@
</span><span class="cx"> 
</span><span class="cx"> class PODArena : public RefCounted&lt;PODArena&gt; {
</span><span class="cx"> public:
</span><del>-    // The arena is configured with an allocator, which is responsible
-    // for allocating and freeing chunks of memory at a time.
-    class Allocator : public RefCounted&lt;Allocator&gt; {
-    public:
-        virtual void* allocate(size_t size) = 0;
-        virtual void free(void* ptr) = 0;
-    protected:
-        virtual ~Allocator() { }
-        friend class WTF::RefCounted&lt;Allocator&gt;;
-    };
-
-    // The Arena's default allocator, which uses fastMalloc and
-    // fastFree to allocate chunks of storage.
-    class FastMallocAllocator : public Allocator {
-    public:
-        static PassRefPtr&lt;FastMallocAllocator&gt; create()
-        {
-            return adoptRef(new FastMallocAllocator);
-        }
-
-        virtual void* allocate(size_t size) { return fastMalloc(size); }
-        virtual void free(void* ptr) { fastFree(ptr); }
-
-    protected:
-        FastMallocAllocator() { }
-    };
-
</del><span class="cx">     // Creates a new PODArena configured with a FastMallocAllocator.
</span><span class="cx">     static PassRefPtr&lt;PODArena&gt; create()
</span><span class="cx">     {
</span><span class="cx">         return adoptRef(new PODArena);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    // Creates a new PODArena configured with the given Allocator.
-    static PassRefPtr&lt;PODArena&gt; create(PassRefPtr&lt;Allocator&gt; allocator)
-    {
-        return adoptRef(new PODArena(allocator));
-    }
-
</del><span class="cx">     // Allocates an object from the arena.
</span><span class="cx">     template&lt;class T&gt; T* allocateObject()
</span><span class="cx">     {
</span><span class="lines">@@ -106,15 +73,9 @@
</span><span class="cx">     friend class WTF::RefCounted&lt;PODArena&gt;;
</span><span class="cx"> 
</span><span class="cx">     PODArena()
</span><del>-        : m_allocator(FastMallocAllocator::create())
-        , m_current(0)
</del><ins>+        : m_current(0)
</ins><span class="cx">         , m_currentChunkSize(DefaultChunkSize) { }
</span><span class="cx"> 
</span><del>-    explicit PODArena(PassRefPtr&lt;Allocator&gt; allocator)
-        : m_allocator(allocator)
-        , m_current(0)
-        , m_currentChunkSize(DefaultChunkSize) { }
-
</del><span class="cx">     // Returns the alignment requirement for classes and structs on the
</span><span class="cx">     // current platform.
</span><span class="cx">     template &lt;class T&gt; static size_t minAlignment()
</span><span class="lines">@@ -132,7 +93,7 @@
</span><span class="cx">         if (!ptr) {
</span><span class="cx">             if (roundedSize &gt; m_currentChunkSize)
</span><span class="cx">                 m_currentChunkSize = roundedSize;
</span><del>-            m_chunks.append(adoptPtr(new Chunk(m_allocator.get(), m_currentChunkSize)));
</del><ins>+            m_chunks.append(adoptPtr(new Chunk(m_currentChunkSize)));
</ins><span class="cx">             m_current = m_chunks.last().get();
</span><span class="cx">             ptr = m_current-&gt;allocate(roundedSize);
</span><span class="cx">         }
</span><span class="lines">@@ -152,19 +113,18 @@
</span><span class="cx">     public:
</span><span class="cx">         // Allocates a block of memory of the given size from the passed
</span><span class="cx">         // Allocator.
</span><del>-        Chunk(Allocator* allocator, size_t size)
-            : m_allocator(allocator)
-            , m_size(size)
</del><ins>+        Chunk(size_t size)
+            : m_size(size)
</ins><span class="cx">             , m_currentOffset(0)
</span><span class="cx">         {
</span><del>-            m_base = static_cast&lt;uint8_t*&gt;(m_allocator-&gt;allocate(size));
</del><ins>+            m_base = static_cast&lt;uint8_t*&gt;(fastMalloc(size));
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         // Frees the memory allocated from the Allocator in the
</span><span class="cx">         // constructor.
</span><span class="cx">         virtual ~Chunk()
</span><span class="cx">         {
</span><del>-            m_allocator-&gt;free(m_base);
</del><ins>+            fastFree(m_base);
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         // Returns a pointer to &quot;size&quot; bytes of storage, or 0 if this
</span><span class="lines">@@ -184,13 +144,11 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">     protected:
</span><del>-        Allocator* m_allocator;
</del><span class="cx">         uint8_t* m_base;
</span><span class="cx">         size_t m_size;
</span><span class="cx">         size_t m_currentOffset;
</span><span class="cx">     };
</span><span class="cx"> 
</span><del>-    RefPtr&lt;Allocator&gt; m_allocator;
</del><span class="cx">     Chunk* m_current;
</span><span class="cx">     size_t m_currentChunkSize;
</span><span class="cx">     Vector&lt;OwnPtr&lt;Chunk&gt; &gt; m_chunks;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPODFreeListArenah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PODFreeListArena.h (149694 => 149695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PODFreeListArena.h        2013-05-07 22:04:01 UTC (rev 149694)
+++ trunk/Source/WebCore/platform/PODFreeListArena.h        2013-05-07 22:06:15 UTC (rev 149695)
</span><span class="lines">@@ -40,12 +40,6 @@
</span><span class="cx">         return adoptRef(new PODFreeListArena);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    // Creates a new PODArena configured with the given Allocator.
-    static PassRefPtr&lt;PODFreeListArena&gt; create(PassRefPtr&lt;Allocator&gt; allocator)
-    {
-        return adoptRef(new PODFreeListArena(allocator));
-    }
-
</del><span class="cx">     template&lt;class Argument1Type&gt; T* allocateObject(const Argument1Type&amp; argument1)
</span><span class="cx">     {
</span><span class="cx">         size_t roundedSize = roundUp(sizeof(T), minAlignment&lt;T&gt;());
</span><span class="lines">@@ -71,9 +65,6 @@
</span><span class="cx">     PODFreeListArena()
</span><span class="cx">         : PODArena() { }
</span><span class="cx"> 
</span><del>-    explicit PODFreeListArena(PassRefPtr&lt;Allocator&gt; allocator)
-        : PODArena(allocator) { }
-
</del><span class="cx">     void* allocate(size_t size)
</span><span class="cx">     {
</span><span class="cx">         void* ptr = 0;
</span><span class="lines">@@ -97,7 +88,7 @@
</span><span class="cx">         if (!ptr) {
</span><span class="cx">             if (size &gt; m_currentChunkSize)
</span><span class="cx">                 m_currentChunkSize = size;
</span><del>-            m_chunks.append(adoptPtr(new FreeListChunk(m_allocator.get(), m_currentChunkSize)));
</del><ins>+            m_chunks.append(adoptPtr(new FreeListChunk(m_currentChunkSize)));
</ins><span class="cx">             m_current = m_chunks.last().get();
</span><span class="cx">             ptr = m_current-&gt;allocate(size);
</span><span class="cx">         }
</span><span class="lines">@@ -111,8 +102,8 @@
</span><span class="cx">             FreeCell *m_next;
</span><span class="cx">         };
</span><span class="cx">     public:
</span><del>-        FreeListChunk(Allocator* allocator, size_t size)
-            : Chunk(allocator, size)
</del><ins>+        explicit FreeListChunk(size_t size)
+            : Chunk(size)
</ins><span class="cx">             , m_freeList(0) { }
</span><span class="cx"> 
</span><span class="cx">         void* allocate(size_t size)
</span></span></pre>
</div>
</div>

</body>
</html>