| OLD | NEW |
| 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 * (C) 2001 Dirk Mueller (mueller@kde.org) | 4 * (C) 2001 Dirk Mueller (mueller@kde.org) |
| 5 * Copyright (C) 2004-2011, 2014 Apple Inc. All rights reserved. | 5 * Copyright (C) 2004-2011, 2014 Apple Inc. All rights reserved. |
| 6 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) | 6 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 // a dedicated heap. | 175 // a dedicated heap. |
| 176 GC_PLUGIN_IGNORE("crbug.com/443854") | 176 GC_PLUGIN_IGNORE("crbug.com/443854") |
| 177 void* operator new(size_t size) | 177 void* operator new(size_t size) |
| 178 { | 178 { |
| 179 return allocateObject(size, false); | 179 return allocateObject(size, false); |
| 180 } | 180 } |
| 181 static void* allocateObject(size_t size, bool isEager) | 181 static void* allocateObject(size_t size, bool isEager) |
| 182 { | 182 { |
| 183 ThreadState* state = ThreadStateFor<ThreadingTrait<Node>::Affinity>::sta
te(); | 183 ThreadState* state = ThreadStateFor<ThreadingTrait<Node>::Affinity>::sta
te(); |
| 184 const char typeName[] = "blink::Node"; | 184 const char typeName[] = "blink::Node"; |
| 185 return ThreadHeap::allocateOnArenaIndex(state, size, isEager ? BlinkGC::
EagerSweepArenaIndex : BlinkGC::NodeArenaIndex, GCInfoTrait<EventTarget>::index(
), typeName); | 185 return Heap::allocateOnArenaIndex(state, size, isEager ? BlinkGC::EagerS
weepArenaIndex : BlinkGC::NodeArenaIndex, GCInfoTrait<EventTarget>::index(), typ
eName); |
| 186 } | 186 } |
| 187 #else // !ENABLE(OILPAN) | 187 #else // !ENABLE(OILPAN) |
| 188 // All Nodes are placed in their own heap partition for security. | 188 // All Nodes are placed in their own heap partition for security. |
| 189 // See http://crbug.com/246860 for detail. | 189 // See http://crbug.com/246860 for detail. |
| 190 void* operator new(size_t); | 190 void* operator new(size_t); |
| 191 void operator delete(void*); | 191 void operator delete(void*); |
| 192 #endif | 192 #endif |
| 193 | 193 |
| 194 static void dumpStatistics(); | 194 static void dumpStatistics(); |
| 195 | 195 |
| (...skipping 734 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 930 } // namespace blink | 930 } // namespace blink |
| 931 | 931 |
| 932 #ifndef NDEBUG | 932 #ifndef NDEBUG |
| 933 // Outside the WebCore namespace for ease of invocation from gdb. | 933 // Outside the WebCore namespace for ease of invocation from gdb. |
| 934 void showNode(const blink::Node*); | 934 void showNode(const blink::Node*); |
| 935 void showTree(const blink::Node*); | 935 void showTree(const blink::Node*); |
| 936 void showNodePath(const blink::Node*); | 936 void showNodePath(const blink::Node*); |
| 937 #endif | 937 #endif |
| 938 | 938 |
| 939 #endif // Node_h | 939 #endif // Node_h |
| OLD | NEW |