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

Side by Side Diff: Source/core/rendering/BidiRun.cpp

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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /** 1 /**
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2003, 2004, 2005, 2006, 2010 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2010 Apple Inc. All rights reserved.
5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
11 * 11 *
12 * This library is distributed in the hope that it will be useful, 12 * This library is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * Library General Public License for more details. 15 * Library General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU Library General Public License 17 * You should have received a copy of the GNU Library General Public License
18 * along with this library; see the file COPYING.LIB. If not, write to 18 * along with this library; see the file COPYING.LIB. If not, write to
19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
20 * Boston, MA 02110-1301, USA. 20 * Boston, MA 02110-1301, USA.
21 * 21 *
22 */ 22 */
23 23
24 #include "config.h" 24 #include "config.h"
25 #include "core/rendering/BidiRun.h" 25 #include "core/rendering/BidiRun.h"
26 #include "core/rendering/RenderArena.h" 26
27 #include "core/platform/Partitions.h"
27 #include <wtf/RefCountedLeakCounter.h> 28 #include <wtf/RefCountedLeakCounter.h>
28 #include <wtf/StdLibExtras.h> 29 #include <wtf/StdLibExtras.h>
29 30
30 using namespace WTF; 31 using namespace WTF;
31 32
32 namespace WebCore { 33 namespace WebCore {
33 34
34 DEFINE_DEBUG_ONLY_GLOBAL(RefCountedLeakCounter, bidiRunCounter, ("BidiRun")); 35 DEFINE_DEBUG_ONLY_GLOBAL(RefCountedLeakCounter, bidiRunCounter, ("BidiRun"));
35 36
36 #ifndef NDEBUG
37 static bool inBidiRunDestroy;
38 #endif
39
40 void BidiRun::destroy() 37 void BidiRun::destroy()
41 { 38 {
42 #ifndef NDEBUG
43 inBidiRunDestroy = true;
44 #endif
45 RenderArena* renderArena = m_object->renderArena();
46 delete this; 39 delete this;
47 #ifndef NDEBUG
48 inBidiRunDestroy = false;
49 #endif
50
51 // Recover the size left there for us by operator delete and free the memory .
52 renderArena->free(*reinterpret_cast<size_t*>(this), this);
53 } 40 }
54 41
55 void* BidiRun::operator new(size_t sz, RenderArena* renderArena) 42 #if ENABLE(PARTITION_ALLOC)
43 void* BidiRun::operator new(size_t sz)
56 { 44 {
57 #ifndef NDEBUG 45 #ifndef NDEBUG
58 bidiRunCounter.increment(); 46 bidiRunCounter.increment();
59 #endif 47 #endif
60 return renderArena->allocate(sz); 48 return partitionAlloc(Partitions::getRenderingPartition(), sz);
61 } 49 }
62 50
63 void BidiRun::operator delete(void* ptr, size_t sz) 51 void BidiRun::operator delete(void* ptr)
64 { 52 {
65 #ifndef NDEBUG 53 #ifndef NDEBUG
66 bidiRunCounter.decrement(); 54 bidiRunCounter.decrement();
67 #endif 55 #endif
68 ASSERT(inBidiRunDestroy); 56 partitionFree(ptr);
69
70 // Stash size where destroy() can find it.
71 *(size_t*)ptr = sz;
72 } 57 }
58 #endif
73 59
74 } 60 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698