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

Side by Side Diff: Source/core/rendering/BidiRun.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 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.
(...skipping 28 matching lines...) Expand all
39 , m_object(object) 39 , m_object(object)
40 , m_box(0) 40 , m_box(0)
41 { 41 {
42 // Stored in base class to save space. 42 // Stored in base class to save space.
43 m_hasHyphen = false; 43 m_hasHyphen = false;
44 m_startsSegment = false; 44 m_startsSegment = false;
45 } 45 }
46 46
47 void destroy(); 47 void destroy();
48 48
49 // Overloaded new operator. 49 #if ENABLE(PARTITION_ALLOC)
50 void* operator new(size_t, RenderArena*); 50 void* operator new(size_t);
51 51 #endif
52 // Overridden to prevent the normal delete from being called.
53 void operator delete(void*, size_t);
54 52
55 BidiRun* next() { return static_cast<BidiRun*>(m_next); } 53 BidiRun* next() { return static_cast<BidiRun*>(m_next); }
56 RenderObject* object() { return m_object; } 54 RenderObject* object() { return m_object; }
57 55
58 private: 56 private:
59 // The normal operator new is disallowed. 57 #if ENABLE(PARTITION_ALLOC)
60 void* operator new(size_t) throw(); 58 void operator delete(void*);
59 #endif
61 60
62 public: 61 public:
63 RenderObject* m_object; 62 RenderObject* m_object;
64 InlineBox* m_box; 63 InlineBox* m_box;
65 }; 64 };
66 65
67 } 66 }
68 67
69 #endif // BidiRun_h 68 #endif // BidiRun_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698